[PATCH 7 of 7] test-import: test git patch import with strip

[Mads Kiilerich]

Matt Mackall wrote, On 04/28/2010 06:33 AM:
> I've queued 3, 5, and 6 too. 4 looks suspicious, you'll need to tell us
> more about that.
>    

Why have you not queued this?

/Mads


Mads Kiilerich wrote, On 04/26/2010 02:37 PM:
> # HG changeset patch
> # User Mads Kiilerich<mads at kiilerich.com>
> # Date 1272280872 -7200
> # Node ID f9c25ea01fb7a488182aee5a8e41f1b7d7086390
> # Parent  fcb1bf03d7a33af55bf57f8c64ee8bc25e3360d1
> test-import: test git patch import with strip
>
> diff --git a/tests/test-import b/tests/test-import
> --- a/tests/test-import
> +++ b/tests/test-import
> @@ -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 ..
>
> diff --git a/tests/test-import.out b/tests/test-import.out
> --- a/tests/test-import.out
> +++ b/tests/test-import.out
> @@ -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
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel at selenic.com
> http://selenic.com/mailman/listinfo/mercurial-devel
>