Skip to content
Snippets Groups Projects
Commit 1e99d09cc03f authored by Pierre-Yves David's avatar Pierre-Yves David :octopus:
Browse files

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

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.

Differential Revision: https://phab.mercurial-scm.org/D9657
parent e6c25ddbb3c9
No related branches found
No related tags found
No related merge requests found
......@@ -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),
};
}
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment