test-convert-cvs: handle older cvs client

tests/test-convert-cvs

@@ -1,50 +1,51 b''
 #!/bin/sh
 
 "$TESTDIR/hghave" cvs cvsps || exit 80
 
 echo "[extensions]" >> $HGRCPATH
 echo "convert = " >> $HGRCPATH
 
 echo % create cvs repository
 mkdir cvsrepo
 cd cvsrepo
 export CVSROOT=`pwd`
 cd ..
 
 cvs -q -d "$CVSROOT" init
 
 echo % create source directory
 mkdir src-temp
 cd src-temp
 echo a > a
 mkdir b
 cd b
 echo c > c
 cd ..
 
 echo % import source directory
 cvs -q import -m import src INITIAL start
 cd ..
 
 echo % checkout source directory
 cvs -q checkout src
 
 echo % convert fresh repo
 hg convert src src-hg | sed -e 's/connecting to.*cvsrepo/connecting to cvsrepo/g'
 cat src-hg/a
 cat src-hg/b/c
 
 echo % commit new file revisions
 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
 hg convert src src-hg | sed -e 's/connecting to.*cvsrepo/connecting to cvsrepo/g'
 cat src-hg/a
 cat src-hg/b/c
 
 
 

tests/test-convert-cvs.out

@@ -1,43 +1,37 b''
 % create cvs repository
 % create source directory
 % import source directory
 N src/a
 N src/b/c
 
 No conflicts created by this import
 
 % checkout source directory
 U src/a
 U src/b/c
 % convert fresh repo
 connecting to cvsrepo
 initializing destination src-hg repository
 scanning source...
 sorting...
 converting...
 1 Initial revision
 0 import
 updating tags
 a
 c
 % commit new file revisions
-Checking in a;
-src/a,v  <--  a
-new revision: 1.2; previous revision: 1.1
-done
-Checking in b/c;
-src/b/c,v  <--  c
-new revision: 1.2; previous revision: 1.1
-done
+checking in src/a,v
+checking in src/b/c,v
 % convert again
 connecting to cvsrepo
 destination src-hg is a Mercurial repository
 scanning source...
 sorting...
 converting...
 0 ci1
 updating tags
 a
 a
 c
 c