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

pulling from source1

     2

requesting all changes

     3

adding changesets

     4

adding manifests

     5

adding file changes

     6

added 10 changesets with 10 changes to 1 files

     7

(run 'hg update' to get a working copy)

     8

requesting all changes

     9

adding changesets

    10

adding manifests

    11

adding file changes

    12

added 10 changesets with 10 changes to 1 files

    13

checking changesets

    14

checking manifests

    15

crosschecking files in changesets and manifests

    16

checking files

    17

1 files, 10 changesets, 10 total revisions

    18

checking changesets

    19

checking manifests

    20

crosschecking files in changesets and manifests

    21

checking files

    22

1 files, 10 changesets, 10 total revisions