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 ../a

     2

searching for changes

     3

abort: repository is unrelated

     4

pulling from ../a

     5

searching for changes

     6

warning: repository is unrelated

     7

adding changesets

     8

adding manifests

     9

adding file changes

    10

added 1 changesets with 1 changes to 1 files (+1 heads)

    11

(run 'hg heads' to see heads, 'hg merge' to merge)

    12

changeset:   1:bdcee5d51fa6

    13

tag:         tip

    14

parent:      -1:000000000000

    15

user:        a

    16

date:        Mon Jan 12 13:46:40 1970 +0000

    17

summary:     a

    18

    19

changeset:   0:f155ba1aa5ba

    20

user:        b

    21

date:        Mon Jan 12 13:46:40 1970 +0000

    22

summary:     b

    23