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

origdir=`pwd`

     4

     5

cat >> readlink.py <<EOF

     6

import os

     7

import sys

     8

     9

for f in sys.argv[1:]:

    10

    print f, '->', os.readlink(f)

    11

EOF

    12

    13

hg init repo

    14

cd repo

    15

ln -s nothing dangling

    16

hg ci -qAm 'add symlink'

    17

    18

hg archive -t files ../archive

    19

hg archive -t tar -p tar ../archive.tar

    20

hg archive -t zip -p zip ../archive.zip

    21

    22

echo '% files'

    23

cd "$origdir"

    24

cd archive

    25

python ../readlink.py dangling

    26

    27

echo '% tar'

    28

cd "$origdir"

    29

tar xf archive.tar

    30

cd tar

    31

python ../readlink.py dangling

    32

    33

echo '% zip'

    34

cd "$origdir"

    35

unzip archive.zip > /dev/null

    36

cd zip

    37

python ../readlink.py dangling