Mercurial > hg
diff tests/test-import-git.t @ 24385:885a573fa619
patch.pathtransform: prepend prefix even if strip is 0
Silly oversight by me.
author | Siddharth Agarwal <sid0@fb.com> |
---|---|
date | Wed, 18 Mar 2015 20:59:06 -0700 |
parents | 5ac8ce04baa2 |
children | 72d7d390ef5d |
line wrap: on
line diff
--- a/tests/test-import-git.t Tue Oct 28 22:32:18 2014 -0700 +++ b/tests/test-import-git.t Wed Mar 18 20:59:06 2015 -0700 @@ -626,6 +626,29 @@ adding dir/d adding dir/dir2/b adding dir/dir2/c + $ hg import --no-commit --prefix dir/ - <<EOF + > diff --git a/a b/a + > --- /dev/null + > +++ b/a + > @@ -0,0 +1 @@ + > +aaa + > diff --git a/d b/d + > --- a/d + > +++ b/d + > @@ -1,1 +1,2 @@ + > d + > +dd + > EOF + applying patch from stdin + $ cat dir/a + aaa + $ cat dir/d + d + dd + $ hg revert -aC + forgetting dir/a (glob) + reverting dir/d (glob) + $ rm dir/a (test that prefixes are relative to the root) $ mkdir tmpdir $ cd tmpdir