Mercurial > hg
comparison tests/test-git-import @ 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 | 4cd52978e188 |
children | f780b1098efc |
comparison
equal
deleted
inserted
replaced
5402:ad0b580cad35 | 5403:477136fa6571 |
---|---|
196 @@ -0,0 +1 @@ | 196 @@ -0,0 +1 @@ |
197 +foo | 197 +foo |
198 EOF | 198 EOF |
199 cat "foo bar" | 199 cat "foo bar" |
200 | 200 |
201 echo % copy then modify the original file | |
202 hg import -m copy-mod-orig - <<EOF | |
203 diff --git a/foo2 b/foo2 | |
204 index 257cc56..fe08ec6 100644 | |
205 --- a/foo2 | |
206 +++ b/foo2 | |
207 @@ -1 +1,2 @@ | |
208 foo | |
209 +new line | |
210 diff --git a/foo2 b/foo3 | |
211 similarity index 100% | |
212 copy from foo2 | |
213 copy to foo3 | |
214 EOF | |
215 | |
216 cat foo3 |