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 a

     4

cd a

     5

echo bar > foo

     6

hg add foo

     7

hg ci -m 'add foo' -d '1000000 0'

     8

     9

echo foobar > foo

    10

hg ci -m 'change foo' -d '1000001 0'

    11

    12

echo 'quiet:'

    13

hg --quiet diff -r 0 -r 1

    14

echo

    15

    16

echo 'normal:'

    17

hg diff -r 0 -r 1

    18

echo

    19

    20

echo 'verbose:'

    21

hg --verbose diff -r 0 -r 1

    22

echo

    23

    24

echo 'debug:'

    25

hg --debug diff -r 0 -r 1

    26

echo