Page MenuHomePhabricator

merge: chain copies with existing copies in working copy
Needs ReviewPublic

Authored by martinvonz on Fri, Jun 5, 9:39 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Summary

This makes the merge code chain and filter copies when grafting with
copies already in the working copy. For example, if the working copy
has renamed file A to B and you somehow graft in a change that renames
B to C, then that will now become a rename from A to C. That will
soon be necessary for hg rebase --collapse. It seems that we don't
have any existing cases where chaining makes a difference.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

martinvonz created this revision.Fri, Jun 5, 9:39 PM

This patch seems related to D8596 which @martinvonz pointed as "not meant to be merged". What should we do with this diff ? is it intended for landing ? If not could get we it out of need-review and marke it RFC ?

This patch seems related to D8596 which @martinvonz pointed as "not meant to be merged". What should we do with this diff ? is it intended for landing ? If not could get we it out of need-review and marke it RFC ?

That was on an earlier version of the series; this series is now ready.

martinvonz updated this revision to Diff 21605.Wed, Jun 10, 1:54 PM
marmoute added inline comments.Thu, Jun 11, 9:45 AM
mercurial/merge.py
1918–1923

I am not sure why we gain all these new cases? where do they comes from?

martinvonz added inline comments.Thu, Jun 11, 9:51 AM
mercurial/merge.py
1918–1923

Did you miss the comment I added on line 1914 or do you think it's not enough? Each case is documented there.