view tests/test-bookmarks-rebase.out @ 9815:49efeed49c94

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.

% initialize repository
adding a
adding b
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
adding c
created new head
adding d
% bookmark list
 * two                       3:2ae46b1d99a7
   one                       1:925d80f479bb
% rebase
saving bundle to 
adding branch
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (-1 heads)
rebase completed
changeset:   3:9163974d1cb5
tag:         tip
tag:         two
tag:         one
parent:      1:925d80f479bb
parent:      2:db815d6d32e6
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     3

changeset:   2:db815d6d32e6
parent:      0:f7b1eb17ad24
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     2

changeset:   1:925d80f479bb
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     1

changeset:   0:f7b1eb17ad24
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     0