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

hg init rep

     4

cd rep

     5

mkdir dir

     6

touch foo dir/bar

     7

hg -v addremove

     8

hg -v commit -m "add 1" -d "1000000 0"

     9

cd dir/

    10

touch ../foo_2 bar_2

    11

hg -v addremove

    12

hg -v commit -m "add 2" -d "1000000 0"

    13

    14

cd ..

    15

hg init sim

    16

cd sim

    17

echo a > a

    18

echo a >> a

    19

echo a >> a

    20

echo c > c

    21

hg commit -Ama

    22

mv a b

    23

rm c

    24

echo d > d

    25

hg addremove -s 50

    26

hg commit -mb