--- a/tests/test-convert-cvs-builtincvsps	Thu Jun 19 00:14:24 2008 +0200
+++ b/tests/test-convert-cvs-builtincvsps	Thu Jun 19 00:14:24 2008 +0200
@@ -7,6 +7,11 @@
     cvs -f "$@"
 }
 
+hgcat()
+{
+    hg --cwd src-hg cat -r tip "$1"
+}
+
 echo "[extensions]" >> $HGRCPATH
 echo "convert = " >> $HGRCPATH
 echo "graphlog = " >> $HGRCPATH
@@ -48,13 +53,13 @@
 
 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
+hgcat a
+hgcat b/c
 
 echo % convert fresh repo with --filemap
 echo include b/c > filemap
 hg convert --filemap filemap src src-filemap | sed -e 's/connecting to.*cvsrepo/connecting to cvsrepo/g'
-cat src-hg/b/c
+hgcat b/c
 hg -R src-filemap log --template '#rev# #desc# files: #files#\n'
 
 echo % commit new file revisions
@@ -67,12 +72,12 @@
 
 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
+hgcat a
+hgcat b/c
 
 echo % convert again with --filemap
 hg convert --filemap filemap src src-filemap | sed -e 's/connecting to.*cvsrepo/connecting to cvsrepo/g'
-cat src-hg/b/c
+hgcat b/c
 hg -R src-filemap log --template '#rev# #desc# files: #files#\n'
 
 echo % commit branch
@@ -87,12 +92,12 @@
 
 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
+hgcat a
+hgcat b/c
 
 echo % convert again with --filemap
 hg convert --filemap filemap src src-filemap | sed -e 's/connecting to.*cvsrepo/connecting to cvsrepo/g'
-cat src-hg/b/c
+hgcat b/c
 hg -R src-filemap log --template '#rev# #desc# files: #files#\n'
 
 echo "graphlog = " >> $HGRCPATH