Merge with crew-stable
authorPatrick Mezard <pmezard@gmail.com>
Wed, 03 Oct 2007 21:08:37 +0200
changeset 5365 ac2ccdcf4539
parent 5363 9bdce4a7964c (current diff)
parent 5364 645a40777fd4 (diff)
child 5366 ff32b2725651
child 5370 6b72ceef7472
Merge with crew-stable
tests/test-convert-cvs.out
--- a/tests/test-convert-cvs	Tue Oct 02 21:01:00 2007 -0700
+++ b/tests/test-convert-cvs	Wed Oct 03 21:08:37 2007 +0200
@@ -38,7 +38,8 @@
 cd src
 echo a >> a
 echo c >> b/c
-cvs -q commit -mci1 . | sed -e 's:.*src/\(.*\),v:src/\1,v:g'
+cvs -q commit -mci1 . | grep '<--' |\
+    sed -e 's:.*src/\(.*\),v.*:checking in src/\1,v:g'
 cd ..
 
 echo % convert again
--- a/tests/test-convert-cvs.out	Tue Oct 02 21:01:00 2007 -0700
+++ b/tests/test-convert-cvs.out	Wed Oct 03 21:08:37 2007 +0200
@@ -21,10 +21,8 @@
 a
 c
 % commit new file revisions
-src/a,v  <--  a
-new revision: 1.2; previous revision: 1.1
-src/b/c,v  <--  b/c
-new revision: 1.2; previous revision: 1.1
+checking in src/a,v
+checking in src/b/c,v
 % convert again
 destination src-hg is a Mercurial repository
 connecting to cvsrepo