sapling/tests/test-rebase-newancestor.out

adding a
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
created new head
@  3:AD 1d4e82ed3c2a
|
| o  2:C 7e1afe9214b2
| |
| o  1:B 0a6620c3c26a
|/
o  0:A 1e635d440a73

@  3:C 0c5887756284
|
o  2:B 4f208f4a1507
|
o  1:AD 1d4e82ed3c2a
|
o  0:A 1e635d440a73
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. 2009-11-09 22:15:49 +03:00			`adding a`
			`1 files updated, 0 files merged, 0 files removed, 0 files unresolved`
			`created new head`
			`@ 3:AD 1d4e82ed3c2a`
			`\|`
			`\| o 2:C 7e1afe9214b2`
			`\| \|`
			`\| o 1:B 0a6620c3c26a`
			`\|/`
			`o 0:A 1e635d440a73`

			`@ 3:C 0c5887756284`
			`\|`
			`o 2:B 4f208f4a1507`
			`\|`
			`o 1:AD 1d4e82ed3c2a`
			`\|`
			`o 0:A 1e635d440a73`