comparison tests/test-import @ 7402:bffdab64dfbb

import: add similarity option (issue295)
author Brendan Cully <brendan@kublai.com>
date Sat, 22 Nov 2008 00:21:57 -0800
parents c4461ea8b4c8
children 6ea0318daf75
comparison
equal deleted inserted replaced
7401:41e87b4d0c9d 7402:bffdab64dfbb
283 diff --git a/a b/b 283 diff --git a/a b/b
284 rename from ../outside/foo 284 rename from ../outside/foo
285 rename to bar 285 rename to bar
286 EOF 286 EOF
287 cd .. 287 cd ..
288
289 echo '% test import with similarity (issue295)'
290 hg init sim
291 cd sim
292 echo 'this is a test' > a
293 hg ci -Ama
294 cat > ../rename.diff <<EOF
295 diff --git a/a b/a
296 deleted file mode 100644
297 --- a/a
298 +++ /dev/null
299 @@ -1,1 +0,0 @@
300 -this is a test
301 diff --git a/b b/b
302 new file mode 100644
303 --- /dev/null
304 +++ b/b
305 @@ -0,0 +1,2 @@
306 +this is a test
307 +foo
308 EOF
309 hg import --no-commit -v -s 1 ../rename.diff
310 hg st -C
311 hg revert -a
312 rm b
313 hg import --no-commit -v -s 100 ../rename.diff
314 hg st -C
315 cd ..