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

copies: rearrange all value comparison conditional

To properly handle the newly tested case (chaining of merges) we will need to
detect more accurately when an actualy merging of the copy information (and
superseed the two existing data). Before starting to do so, we need to
reorganise the values comparison to introduce different conditional branches
when such actual merging is needed/detected.

To avoid mixing too many change in this complicated code, we do the
reorganisation before adding the "overwrite detection" logic in the next
changesets.

Differential Revision: https://phab.mercurial-scm.org/D9612
parent 5e1399bd
No related merge requests found
Loading
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