D7974: merge: when rename was made on both sides, use ancestor as merge base

Closed by commit rHGb4057d001760: merge: when rename was made on both sides, use ancestor as merge base (authored by martinvonz). This revision was automatically updated to reflect the committed changes. This revision was not accepted when it landed; it landed in state "Needs Review".

D7974: merge: when rename was made on both sides, use ancestor as merge base

martinvonz edited the summary of this revision. martinvonz updated this revision to Diff 19803. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7974?vs=19689=19803 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7974/new/

D7974: merge: when rename was made on both sides, use ancestor as merge base

martinvonz added a comment. In D7974#118853 , @pulkit wrote: > I am seeing this failure, hope it helps: > > (vm)~/repo/hgpush/tests$ ./run-tests.py test-rename-merge1.t > running 1 tests using 1 parallel processes

D7974: merge: when rename was made on both sides, use ancestor as merge base

pulkit added a comment. I am seeing this failure, hope it helps: (vm)~/repo/hgpush/tests$ ./run-tests.py test-rename-merge1.t running 1 tests using 1 parallel processes

D7974: merge: when rename was made on both sides, use ancestor as merge base

martinvonz added a comment. In D7974#118685 , @martinvonz wrote: > In D7974#118682 , @pulkit wrote: > >> `test-rename-merge1.t` fails with this patch. Looks like there is one more instance of

D7974: merge: when rename was made on both sides, use ancestor as merge base

martinvonz added a comment. In D7974#118682 , @pulkit wrote: > `test-rename-merge1.t` fails with this patch. Looks like there is one more instance of prompt which is not needed anymore. I didn't amend that in flight as I was not sure.

D7974: merge: when rename was made on both sides, use ancestor as merge base

pulkit added a comment. `test-rename-merge1.t` fails with this patch. Looks like there is one more instance of prompt which is not needed anymore. I didn't amend that in flight as I was not sure. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION

D7974: merge: when rename was made on both sides, use ancestor as merge base

martinvonz updated this revision to Diff 19689. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7974?vs=19568=19689 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7974/new/ REVISION DETAIL

D7974: merge: when rename was made on both sides, use ancestor as merge base

martinvonz added a comment. In D7974#118492 , @durin42 wrote: > This one needs rebased. Done. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7974/new/ REVISION DETAIL

D7974: merge: when rename was made on both sides, use ancestor as merge base

This revision now requires changes to proceed. durin42 added a comment. durin42 requested changes to this revision. This one needs rebased. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7974/new/ REVISION DETAIL https://phab.mercurial-scm.org/D7974

D7974: merge: when rename was made on both sides, use ancestor as merge base

martinvonz edited the summary of this revision. martinvonz updated this revision to Diff 19568. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7974?vs=19526=19568 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7974/new/

D7974: merge: when rename was made on both sides, use ancestor as merge base

martinvonz added a comment. I'll insert another patch with another fun test case before this patch soon REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7974/new/ REVISION DETAIL https://phab.mercurial-scm.org/D7974 To: martinvonz, #hg-reviewers Cc:

D7974: merge: when rename was made on both sides, use ancestor as merge base

martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY When both sides of a merge have renamed a file to the same place, we would treat that as a "both created" action in merge.py. That means that we'd use an