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

cat > patchtool.py <<EOF

     4

import sys

     5

print 'Using custom patch'

     6

if '--binary' in sys.argv:

     7

    print '--binary found !'

     8

EOF

     9

    10

echo "[ui]" >> $HGRCPATH

    11

echo "patch=python ../patchtool.py" >> $HGRCPATH

    12

    13

hg init a

    14

cd a

    15

echo a > a

    16

hg commit -Ama -d '1 0'

    17

echo b >> a

    18

hg commit -Amb -d '2 0'

    19

cd ..

    20

    21

# This test check that:

    22

# - custom patch commands with arguments actually works

    23

# - patch code does not try to add weird arguments like

    24

# --binary when custom patch commands are used. For instance

    25

# --binary is added by default under win32.

    26

    27

echo % check custom patch options are honored

    28

hg --cwd a export -o ../a.diff tip

    29

hg clone -r 0 a b

    30

    31

hg --cwd b import -v ../a.diff

    32

    33

    34

    35

    36