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

# Corrupt an hg repo with two pulls.

     4

#

     5

     6

# create one repo with a long history

     7

hg init source1

     8

cd source1

     9

touch foo

    10

hg add foo

    11

for i in 1 2 3 4 5 6 7 8 9 10; do

    12

    echo $i >> foo

    13

    hg ci -m $i

    14

done

    15

cd ..

    16

    17

# create a third repo to pull both other repos into it

    18

hg init version2

    19

hg -R version2 pull source1 &

    20

sleep 1

    21

    22

hg clone --pull -U version2 corrupted

    23

wait

    24

hg -R corrupted verify

    25

hg -R version2 verify