Skip to content
Snippets Groups Projects
Commit 58e7ee23ddbd authored by Martin von Zweigbergk's avatar Martin von Zweigbergk
Browse files

copies: handle more cases where a file got replaced by a copy

This patch fixes the changeset-centric version in a pretty
straight-forward way. It fixes it to automatically resolve the
conflict, which is better than resulting in a modify/delete conflict
as it was before b4057d001760 (merge: when rename was made on both
sides, use ancestor as merge base, 2020-01-22).

I'll leave it for later to test and explicitly handle cases where
files have been renamed to the same target on different sides of the
merge.

Differential Revision: https://phab.mercurial-scm.org/D8653
parent 4b79e92a5ef8
No related branches found
No related tags found
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