Enum Resolution

pub enum Resolution {
    SourceLocationAffectedByRename {
        final_location: BString,
    },
    OursModifiedTheirsRenamedAndChangedThenRename {
        merged_mode: Option<EntryMode>,
        merged_blob: Option<ContentMerge>,
        final_location: Option<BString>,
    },
    OursModifiedTheirsModifiedThenBlobContentMerge {
        merged_blob: ContentMerge,
    },
}

Describes of a conflict involving our change and their change was specifically resolved.

Note that all resolutions are side-agnostic, so ours could also have been theirs and vice versa. Also note that symlink merges are always done via binary merge, using the same logic.

Variants

SourceLocationAffectedByRename

ours had a renamed directory and theirs made a change in the now renamed directory. We moved that change into its location.

Fields

final_location: BString

The repository-relative path to the location that the change ended up in after being affected by a renamed directory.

OursModifiedTheirsRenamedAndChangedThenRename

ours was a modified blob and theirs renamed that blob. We moved the changed blob from ours to its new location, and merged it successfully. If this is a copy, the source of the copy was set to be the changed blob as well so both match.

Fields

merged_mode: Option<EntryMode>

If one side added the executable bit, we always add it in the merged result.

merged_blob: Option<ContentMerge>

If Some(…), the content of the involved blob had to be merged.

final_location: Option<BString>

The repository relative path to the location the blob finally ended up in. It’s Some() only if they rewrote the blob into a directory which we renamed on our side.

OursModifiedTheirsModifiedThenBlobContentMerge

ours and theirs carried changes and where content-merged.

Note that ours and theirs may also be rewrites with the same destination and mode, or additions.

Fields

merged_blob: ContentMerge

The outcome of the content merge.

Trait Implementations

impl Clone for Resolution

fn clone(&self) -> Resolution

Returns a copy of the value.

fn clone_from(&mut self, source: &Self)

Performs copy-assignment from source.

impl Debug for Resolution

fn fmt(&self, f: &mut Formatter<'_>) -> Result

Formats the value using the given formatter.