Mercurial > hg
comparison hgmerge @ 5403:477136fa6571
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.
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Sat, 06 Oct 2007 15:30:15 -0300 |
parents | f53d97d651f4 |
children | 3c80ecdc1bcd |
comparison
equal
deleted
inserted
replaced
5402:ad0b580cad35 | 5403:477136fa6571 |
---|