pub struct PullReport {
pub fast_forwarded: bool,
pub advanced: Vec<RecordKey>,
pub merged: Vec<RecordKey>,
pub conflicts: Vec<PullConflict>,
}Expand description
What a GitStore::pull did.
Fields§
§fast_forwarded: boolThe pull was a clean fast-forward (or already up-to-date).
advanced: Vec<RecordKey>Records taken from the remote because the local side was simply behind:
the local revision appears in the remote record’s ancestors, so this
is an advance rather than a divergence, exactly as sync decides it
(spec §3.4, gonzalo#289). Nothing local is lost — the local revision is
already in the chain being adopted.
merged: Vec<RecordKey>Records reconciled by a content-aware 3-way merge into a merge commit.
conflicts: Vec<PullConflict>Divergences kept local and surfaced for the caller to resolve.
Trait Implementations§
Source§impl Debug for PullReport
impl Debug for PullReport
Source§impl Default for PullReport
impl Default for PullReport
Source§fn default() -> PullReport
fn default() -> PullReport
Returns the “default value” for a type. Read more
Auto Trait Implementations§
impl Freeze for PullReport
impl RefUnwindSafe for PullReport
impl Send for PullReport
impl Sync for PullReport
impl Unpin for PullReport
impl UnsafeUnpin for PullReport
impl UnwindSafe for PullReport
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