rebase: make sure the newancestor is used during the whole update
(issue1561) Before this change, newancestor was used only once as a replacement for ancestor.ancestor, but merge.update calls ancestor.ancestor several times, so it ends up with the "wrong" ancestor (the real ancestor, but we want the parent of the rebased changeset for all but the first rebased changeset). Added a new test case for this: test-rebase-newancestor. Also, in one scenario in test-rebase-collapse, there was a spurious conflict caused by the same issue, so that test case was fixed by removing the now unneeded conflict resolution and the output was adapted accordingly.
Showing
- hgext/rebase.py 6 additions, 4 deletionshgext/rebase.py
- tests/test-rebase-collapse 1 addition, 6 deletionstests/test-rebase-collapse
- tests/test-rebase-collapse.out 1 addition, 5 deletionstests/test-rebase-collapse.out
- tests/test-rebase-newancestor 31 additions, 0 deletionstests/test-rebase-newancestor
- tests/test-rebase-newancestor.out 19 additions, 0 deletionstests/test-rebase-newancestor.out
Loading
Please register or sign in to comment