Always copy the necessary files before applying a git patch This patch removes the "copymod" attribute from the gitpatch class. AFAICS, that attribute was only used to delay the copying of renamed/copied files if there are no other changes to the target, but in this case, if there are changes to the source, we'll end up copying the wrong version. This should fix issue762.

     1

#!/bin/sh

     2

     3

mkdir t

     4

cd t

     5

hg init

     6

     7

echo 1 > a

     8

hg ci -qAm "first" -d "1000000 0"

     9

    10

hg cp a b

    11

hg mv a c

    12

echo 2 >> b

    13

echo 2 >> c

    14

    15

hg ci -qAm "second" -d "1000000 0"

    16

    17

hg co -C 0

    18

    19

echo 0 > a

    20

echo 1 >> a

    21

    22

hg ci -qAm "other" -d "1000000 0"

    23

    24

hg merge --debug

    25

    26

echo "-- b --"

    27

cat b

    28

    29

echo "-- c --"

    30

cat c