Mercurial > hg > mercurial-crew-with-dirclash

diff tests/test-git-import.out @ 5403:477136fa6571

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 826659bd8053
children 8feb33c2d153
line wrap: on
line diff
--- a/tests/test-git-import.out
+++ b/tests/test-git-import.out
@@ -63,3 +63,6 @@ a874b471193996e7cb034bb301cac7bdaf3e3f46
 % filenames with spaces
 applying patch from stdin
 foo
+% copy then modify the original file
+applying patch from stdin
+foo