Patchwork D9657: copies-rust: fix reverted argument when merging tiny minor or major

login
register
mail settings
Submitter phabricator
Date Dec. 23, 2020, 2:11 a.m.
Message ID <differential-rev-PHID-DREV-tyl53kk57v5fno5mfzw5-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/47967/
State Superseded
Headers show

Comments

phabricator - Dec. 23, 2020, 2:11 a.m.
marmoute created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REVISION SUMMARY
  The argument where not passed in the right other. This is not caught by the test
  (yet) because it is a sub case of a special case. Am I adding this to my list of
  things to test. Using test directly in Rust would be appropriate here. However
  we don't have the ability to test this code that way yet, and I am focussing on
  other part of that work right now.

REPOSITORY
  rHG Mercurial

BRANCH
  default

REVISION DETAIL
  https://phab.mercurial-scm.org/D9657

AFFECTED FILES
  rust/hg-core/src/copy_tracing.rs

CHANGE DETAILS




To: marmoute, #hg-reviewers
Cc: mercurial-patches, mercurial-devel

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
@@ -645,7 +645,7 @@ 
                 }
                 Some(src_minor) => {
                     let (pick, overwrite) =
-                        cmp_value(oracle, &dest, &src_major, src_minor);
+                        cmp_value(oracle, &dest, src_minor, &src_major);
                     if overwrite {
                         oracle.record_overwrite(src_minor.rev, current_merge);
                         oracle.record_overwrite(src_major.rev, current_merge);
@@ -661,8 +661,8 @@ 
                         minor.insert(dest, src);
                     } else {
                         match pick {
-                            MergePick::Any | MergePick::Major => None,
-                            MergePick::Minor => minor.insert(dest, src_major),
+                            MergePick::Any | MergePick::Minor => None,
+                            MergePick::Major => minor.insert(dest, src_major),
                         };
                     }
                 }