Mercurial > hg
changeset 11407:f5be44090ba8
test-import: test git patch import with strip
Tests revision 0429d0d49f92
| author | Mads Kiilerich <mads@kiilerich.com> |
|---|---|
| date | Wed, 16 Jun 2010 17:43:35 +0200 |
| parents | 42408cd43f55 |
| children | 534c69494918 |
| files | tests/test-import tests/test-import.out |
| diffstat | 2 files changed, 8 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-import Sat Jun 19 13:00:08 2010 -0500 +++ b/tests/test-import Wed Jun 16 17:43:35 2010 +0200 @@ -296,31 +296,31 @@ EOF cd .. -echo '% test import with similarity (issue295)' +echo '% test import with similarity and git and strip (issue295 et al.)' hg init sim cd sim echo 'this is a test' > a hg ci -Ama cat > ../rename.diff <<EOF -diff --git a/a b/a +diff --git a/foo/a b/foo/a deleted file mode 100644 ---- a/a +--- a/foo/a +++ /dev/null @@ -1,1 +0,0 @@ -this is a test -diff --git a/b b/b +diff --git a/foo/b b/foo/b new file mode 100644 --- /dev/null -+++ b/b ++++ b/foo/b @@ -0,0 +1,2 @@ +this is a test +foo EOF -hg import --no-commit -v -s 1 ../rename.diff +hg import --no-commit -v -s 1 ../rename.diff -p2 hg st -C hg revert -a rm b -hg import --no-commit -v -s 100 ../rename.diff +hg import --no-commit -v -s 100 ../rename.diff -p2 hg st -C cd ..
--- a/tests/test-import.out Sat Jun 19 13:00:08 2010 -0500 +++ b/tests/test-import.out Wed Jun 16 17:43:35 2010 +0200 @@ -279,7 +279,7 @@ % test paths outside repo root applying patch from stdin abort: ../outside/foo not under root -% test import with similarity (issue295) +% test import with similarity and git and strip (issue295 et al.) adding a applying ../rename.diff patching file a