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

echo a > a/a

     5

hg --cwd a ci -Ama

     6

     7

hg clone a c

     8

     9

hg clone a b

    10

echo b >> b/a

    11

hg --cwd b ci -mb

    12

    13

echo % push should push to default when default-push not set

    14

hg --cwd b push | sed 's/pushing to.*/pushing/'

    15

    16

echo % push should push to default-push when set

    17

echo 'default-push = ../c' >> b/.hg/hgrc

    18

hg --cwd b push | sed 's/pushing to.*/pushing/'