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 bar

     2

adding foo

     3

adding quux1

     4

adding quux2

     5

merging bar

     6

merging bar failed!

     7

merging foo and baz

     8

merging baz failed!

     9

1 files updated, 0 files merged, 0 files removed, 2 files unresolved

    10

There are unresolved merges, you can redo the full merge using:

    11

  hg update -C 2

    12

  hg merge 1

    13

3 files updated, 0 files merged, 1 files removed, 0 files unresolved

    14

merging bar

    15

merging bar failed!

    16

merging baz and foo

    17

merging baz failed!

    18

1 files updated, 0 files merged, 0 files removed, 2 files unresolved

    19

There are unresolved merges, you can redo the full merge using:

    20

  hg update -C 1

    21

  hg merge 2