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

     1

adding foo

     2

Patch queue now empty

     3

applying patch1

     4

applying patch2

     5

applying bad-patch

     6

transaction abort!

     7

rollback completed

     8

cleaning up working directory...done

     9

abort: decoding near 'é': 'ascii' codec can't decode byte 0xe9 in position 0: ordinal not in range(128)!

    10

changeset:   0:bbd179dfa0a7

    11

tag:         tip

    12

user:        test

    13

date:        Thu Jan 01 00:00:00 1970 +0000

    14

summary:     add foo

    15

    16

% bar should be gone; other unknown/ignored files should still be around

    17

? untracked-file

    18

I .hgignore

    19

C foo