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

# No local source

     4

hg clone a b

     5

echo $?

     6

     7

# No remote source

     8

hg clone http://127.0.0.1:3121/a b

     9

echo $?

    10

rm -rf b # work around bug with http clone

    11

    12

# Inaccessible source

    13

mkdir a

    14

chmod 000 a

    15

hg clone a b

    16

echo $?

    17

    18

# Inaccessible destination

    19

mkdir b

    20

cd b

    21

hg init

    22

hg clone . ../a

    23

echo $?

    24

cd ..

    25

chmod 700 a

    26

rm -r a b

    27

    28

# Source of wrong type

    29

mkfifo a

    30

hg clone a b

    31

echo $?

    32

rm a

    33

    34

# Default destination, same directory

    35

mkdir q

    36

cd q

    37

hg init

    38

cd ..

    39

hg clone q

    40

    41

true