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

changeset:   0:9426b370c206

     2

tag:         tip

     3

user:        My Name <myname@example.com>

     4

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

     5

summary:     commit-1

     6

     7

changeset:   1:4997f15a1b24

     8

tag:         tip

     9

user:        foo@bar.com

    10

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

    11

summary:     commit-1

    12

    13

changeset:   2:72b8012b424e

    14

tag:         tip

    15

user:        foobar <foo@bar.com>

    16

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

    17

summary:     commit-1

    18

    19

changeset:   3:35ff3067bedd

    20

tag:         tip

    21

user:        foo@bar.com

    22

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

    23

summary:     commit-1

    24

    25

abort: Please specify a username.

    26

transaction abort!

    27

rollback completed

    28

No username found, using user@host instead