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

#!/bin/sh

     2

     3

hg init a

     4

cd a

     5

touch empty1

     6

hg add empty1

     7

hg commit -m 'add empty1' -d '1000000 0'

     8

     9

touch empty2

    10

hg add empty2

    11

hg commit -m 'add empty2' -d '1000000 0'

    12

    13

hg up -C 0

    14

touch empty3

    15

hg add empty3

    16

hg commit -m 'add empty3' -d '1000000 0'

    17

    18

hg heads

    19

    20

hg merge 1

    21

# before changeset 05257fd28591, we didn't notice the

    22

# empty file that came from rev 1.

    23

hg status

    24

hg commit -m merge -d '1000000 0'

    25

hg manifest --debug tip