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

=======================

     2

Should display 'First commit message'

     3

description:

     4

First commit message

     5

     6

     7

     8

=======================

     9

Should display 'Second commit message'

    10

description:

    11

Second commit message

    12

    13

    14

    15

=======================

    16

Should display 'Third commit message\n This is the 3rd log message'

    17

description:

    18

Third commit message

    19

 This is the 3rd log message

    20

    21

    22

    23

=======================

    24

Should display 'Fifth commit message\n This is the 5th log message'

    25

description:

    26

Fifth commit message

    27

    28

    29