mercurial-crew-with-dirclash: tests/test-impexp-branch.out@f191bc3916f7 (annotated)

merge: do early copy to deal with issue636 Without copies/renames, merges source names are 1:1 with their targets. Copies and renames introduce the possibility that there will be two merges with the same input but different output. By doing the copy to the destination name before the merge, the actual merge becomes 1:1 again, and no source is the input to two different merges. - add a preliminary scan to applyupdates to do copies - for the merge action, pass the old name (for finding ancestors) and the new name (for input to the merge) to filemerge - eliminate the old post-merge copy - lookup file contents from new name in filemerge - pass new name to external merge helper - report merge failure at new name - add a test

4602 d9d177ef748a Fix up tests for new branch message Brendan Cully <brendan@kublai.com> parents: 4441 diff changeset	1	marked working directory as branch abranch
4439 871ff96a86cc Add a test for the Branch header being in hg export. Eric Hopper <hopper@omnifarious.org> parents: diff changeset	2	applying patch from stdin
871ff96a86cc Add a test for the Branch header being in hg export. Eric Hopper <hopper@omnifarious.org> parents: diff changeset	3	applying patch from stdin
4441 32ea809e5bd1 Alter test to test import --exact to make sure it works with branches. Eric Hopper <hopper@omnifarious.org> parents: 4439 diff changeset	4	applying patch from stdin
32ea809e5bd1 Alter test to test import --exact to make sure it works with branches. Eric Hopper <hopper@omnifarious.org> parents: 4439 diff changeset	5	applying patch from stdin

author	Matt Mackall <mpm@selenic.com>
	Wed, 01 Aug 2007 12:33:12 -0500
changeset 5045	f191bc3916f7
parent 4602	d9d177ef748a
permissions	-rw-r--r--