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

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

     2

pulling from ../source

     3

abort: pretxncommit hook exited with status 1

     4

transaction abort!

     5

rollback completed

     6

searching for changes

     7

adding changesets

     8

adding manifests

     9

adding file changes

    10

added 1 changesets with 1 changes to 1 files

    11

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

    12

checking changesets

    13

checking manifests

    14

crosschecking files in changesets and manifests

    15

checking files

    16

1 files, 2 changesets, 2 total revisions