Mercurial > public > mercurial-scm > hg
diff tests/test-git-import.t @ 12577:05210e955bef
Merge with stable
| author | Patrick Mezard <pmezard@gmail.com> |
|---|---|
| date | Tue, 28 Sep 2010 01:11:24 +0200 |
| parents | tests/test-git-import@77600d697d0e tests/test-git-import@22f3353bcc36 |
| children | b96de59a2c39 |
line wrap: on
line diff
--- a/tests/test-git-import.t Mon Sep 27 22:49:30 2010 +0200 +++ b/tests/test-git-import.t Tue Sep 28 01:11:24 2010 +0200 @@ -335,3 +335,24 @@ $ cat foo3 foo +Move text file and patch as binary + + $ echo a > text2 + $ hg ci -Am0 + adding text2 + $ hg import -d "1000000 0" -m rename-as-binary - <<"EOF" + > diff --git a/text2 b/binary2 + > rename from text2 + > rename to binary2 + > index 78981922613b2afb6025042ff6bd878ac1994e85..10efcb362e9f3b3420fcfbfc0e37f3dc16e29757 + > GIT binary patch + > literal 5 + > Mc$`b*O5$Pw00T?_*Z=?k + > + > EOF + applying patch from stdin + $ python $TESTDIR/printrepr.py < binary2 + a + b + \x00 + $ hg st --copies --change . abort: unknown revision '.echo'!