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

[marmoute (Pierre-Yves David)]

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

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, , _major, src_minor);
+cmp_value(oracle, , src_minor, _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),
 };
 }
 }



To: marmoute, #hg-reviewers
Cc: mercurial-patches, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D6259: [POC] revset: on-disk cache for children queries

[baymax (Baymax, Your Personal Patch-care Companion)]

This revision now requires changes to proceed.
baymax added a comment.
baymax requested changes to this revision.


  There seems to have been no activities on this Diff for the past 3 Months.
  
  By policy, we are automatically moving it out of the `need-review` state.
  
  Please, move it back to `need-review` without hesitation if this diff should 
still be discussed.
  
  :baymax:need-review-idle:

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6259/new/

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

To: joerg.sonnenberger, #hg-reviewers, marmoute, baymax
Cc: pulkit, mercurial-patches, marmoute, martinvonz, indygreg, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel