Struct MergeResult

Source

pub struct MergeResult {
    pub common_patches: Vec<PatchId>,
    pub patches_a_only: Vec<PatchId>,
    pub patches_b_only: Vec<PatchId>,
    pub conflicts: Vec<Conflict>,
    pub is_clean: bool,
}

Expand description

Result of a merge operation.

Fields§

§common_patches: Vec<PatchId>

Patches that are in both branches (already applied, include once).

§patches_a_only: Vec<PatchId>

Patches unique to branch A (applied in order).

§patches_b_only: Vec<PatchId>

Patches unique to branch B (applied in order).

§conflicts: Vec<Conflict>

Conflicts detected between patches from different branches.

§is_clean: bool

Whether the merge is clean (no conflicts).

Implementations§

Source §

impl MergeResult

Source

pub fn all_patch_ids(&self) -> Vec<PatchId> ⓘ

Get all patch IDs that should be in the merged result.

Trait Implementations§

Source §

impl Clone for MergeResult

Source §

fn clone(&self) -> MergeResult

Returns a duplicate of the value. Read more

1.0.0 · Source§

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

Performs copy-assignment from source. Read more

Source §

impl Debug for MergeResult

Source §

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

Formats the value using the given formatter. Read more

Auto Trait Implementations§

§

impl UnwindSafe for MergeResult

Blanket Implementations§

Source §

impl<T> Any for T
where T: 'static + ?Sized,

Source §

fn type_id(&self) -> TypeId

Gets the TypeId of self. Read more

Source §

impl<T> Borrow<T> for T
where T: ?Sized,

Source §

fn borrow(&self) -> &T

Immutably borrows from an owned value. Read more

Source §

impl<T> BorrowMut<T> for T
where T: ?Sized,

Source §

fn borrow_mut(&mut self) -> &mut T

Mutably borrows from an owned value. Read more

Source §

impl<T> CloneToUninit for T
where T: Clone,

Source §

unsafe fn clone_to_uninit(&self, dest: *mut u8)

🔬This is a nightly-only experimental API. (clone_to_uninit)

Performs copy-assignment from self to dest. Read more

Source §

impl<T> From<T> for T

Source §

fn from(t: T) -> T

Returns the argument unchanged.

Source §

impl<T> Instrument for T

Source §

fn instrument(self, span: Span) -> Instrumented<Self>

Instruments this type with the provided Span, returning an Instrumented wrapper. Read more

Source §

fn in_current_span(self) -> Instrumented<Self>

Instruments this type with the current Span, returning an Instrumented wrapper. Read more

Source §

impl<T, U> Into for T
where U: From<T>,

Source §

fn into(self) -> U

Calls U::from(self).

That is, this conversion is whatever the implementation of From<T> for U chooses to do.

Source §

impl<T> IntoEither for T

Source §

fn into_either(self, into_left: bool) -> Either<Self, Self>

Converts self into a Left variant of Either<Self, Self> if into_left is true. Converts self into a Right variant of Either<Self, Self> otherwise. Read more

Source §

fn into_either_with<F>(self, into_left: F) -> Either<Self, Self>
where F: FnOnce(&Self) -> bool,

Converts self into a Left variant of Either<Self, Self> if into_left(&self) returns true. Converts self into a Right variant of Either<Self, Self> otherwise. Read more

Source §