Mercurial > hg > mercurial-crew-with-dirclash

comparison 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
comparison
equal deleted inserted replaced
5402:ad0b580cad35 5403:477136fa6571
61 045c85ba38952325e126c70962cc0f9d9077bc67 644 mbinary1 61 045c85ba38952325e126c70962cc0f9d9077bc67 644 mbinary1
62 a874b471193996e7cb034bb301cac7bdaf3e3f46 644 mbinary2 62 a874b471193996e7cb034bb301cac7bdaf3e3f46 644 mbinary2
63 % filenames with spaces 63 % filenames with spaces
64 applying patch from stdin 64 applying patch from stdin
65 foo 65 foo
66 % copy then modify the original file
67 applying patch from stdin
68 foo