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

copies-rust: record overwrite when merging

When detecting fresh value (from current rev) overwriting older ones during
merges, we also record this overwrite for to help potential future comparison.

This does really have any performance effect right now, but it get use closer to
be able to drop all `is_ancestors` when merging.

Differential Revision: https://phab.mercurial-scm.org/D9499
parent 7d99614b7b77
No related branches found
No related tags found
No related merge requests found
......@@ -731,8 +731,9 @@
} 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.
......@@ -734,8 +735,9 @@
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;
......
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