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

echo "[extensions]" >> $HGRCPATH

     4

echo "mq=" >> $HGRCPATH

     5

     6

hg init a

     7

cd a

     8

echo a > a

     9

hg ci -Ama

    10

    11

hg qnew a.patch

    12

echo a >> a

    13

hg qrefresh

    14

    15

hg qnew b.patch

    16

echo b > b

    17

hg add b

    18

hg qrefresh

    19

    20

hg qnew c.patch

    21

echo c > c

    22

hg add c

    23

hg qrefresh

    24

    25

hg qgoto a.patch

    26

hg qgoto c.patch

    27

hg qgoto b.patch