Submitter | phabricator |
---|---|
Date | Dec. 2, 2020, 4:03 p.m. |
Message ID | <differential-rev-PHID-DREV-qjxsgkk2va4p5u4semwp-req@mercurial-scm.org> |
Download | mbox | patch |
Permalink | /patch/47781/ |
State | Superseded |
Headers | show |
Comments
Patch
diff --git a/rust/hg-core/src/copy_tracing.rs b/rust/hg-core/src/copy_tracing.rs --- a/rust/hg-core/src/copy_tracing.rs +++ b/rust/hg-core/src/copy_tracing.rs @@ -722,11 +722,13 @@ } else { // The last value comes the current merge, this value -will- win // eventually. + oracle.record_overwrite(src_minor.rev, src_major.rev); MergePick::Major } } else if src_minor.rev == current_merge { // The last value comes the current merge, this value -will- win // eventually. + oracle.record_overwrite(src_major.rev, src_minor.rev); MergePick::Minor } else if src_major.path == src_minor.path { // we have the same value, but from other source;