Mercurial > hg-stable

changeset 12586:b96de59a2c39

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: fix 05210e955bef merge error in test-git-import.t
author Adrian Buehlmann <adrian@cadifra.com>
date Tue, 28 Sep 2010 19:29:14 +0200
parents 385fd0eee005
children e3247ceaca5e
files tests/test-git-import.t
diffstat 1 files changed, 7 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-git-import.t	Wed Sep 29 01:33:31 2010 +0200
+++ b/tests/test-git-import.t	Tue Sep 28 19:29:14 2010 +0200
@@ -351,8 +351,14 @@
   > 
   > EOF
   applying patch from stdin
+
   $ python $TESTDIR/printrepr.py < binary2
   a
   b
   \x00
-  $ hg st --copies --change .  abort: unknown revision '.echo'!
+
+  $ hg st --copies --change . 
+  A binary2
+    text2
+  R text2
+