pub struct MergeTreesResult {
pub tree: ObjectId,
pub paths: Vec<MergedPath>,
pub clean: bool,
pub cleanup_paths: Vec<Vec<u8>>,
pub info_messages: Vec<MergeInfoMessage>,
}Expand description
The outcome of a 3-way tree merge: the merged top-level tree plus per-path detail and a clean/conflicted flag.
Fields§
§tree: ObjectIdObject id of the merged top-level tree (always written, even on conflict — conflicted blobs go in with their marker content).
paths: Vec<MergedPath>Per-path results, sorted by path.
clean: boolFalse if any path conflicted.
cleanup_paths: Vec<Vec<u8>>Original paths removed by rename or directory-rename rewrites. These are cleanup-only paths for porcelains materializing a conflicted merge; they are absent from the merged tree.
info_messages: Vec<MergeInfoMessage>Non-conflict informational messages produced while detecting renames.
Implementations§
Source§impl MergeTreesResult
impl MergeTreesResult
Sourcepub fn conflicts(&self) -> impl Iterator<Item = &MergedPath>
pub fn conflicts(&self) -> impl Iterator<Item = &MergedPath>
Iterate over the paths that conflicted, in path order.
Trait Implementations§
Source§impl Clone for MergeTreesResult
impl Clone for MergeTreesResult
Source§fn clone(&self) -> MergeTreesResult
fn clone(&self) -> MergeTreesResult
Returns a duplicate of the value. Read more
1.0.0 (const: unstable) · Source§fn clone_from(&mut self, source: &Self)
fn clone_from(&mut self, source: &Self)
Performs copy-assignment from
source. Read moreAuto Trait Implementations§
impl Freeze for MergeTreesResult
impl RefUnwindSafe for MergeTreesResult
impl Send for MergeTreesResult
impl Sync for MergeTreesResult
impl Unpin for MergeTreesResult
impl UnsafeUnpin for MergeTreesResult
impl UnwindSafe for MergeTreesResult
Blanket Implementations§
Source§impl<T> BorrowMut<T> for Twhere
T: ?Sized,
impl<T> BorrowMut<T> for Twhere
T: ?Sized,
Source§fn borrow_mut(&mut self) -> &mut T
fn borrow_mut(&mut self) -> &mut T
Mutably borrows from an owned value. Read more