--- a/tests/test-convert-cvs-builtincvsps	Fri May 15 09:43:30 2009 +0200
+++ b/tests/test-convert-cvs-builtincvsps	Tue May 19 23:02:17 2009 +0200
@@ -62,7 +62,7 @@
 echo include b/c > filemap
 hg convert --filemap filemap src src-filemap | sed -e 's/connecting to.*cvsrepo/connecting to cvsrepo/g'
 hgcat b/c
-hg -R src-filemap log --template '#rev# #desc# files: #files#\n'
+hg -R src-filemap log --template '{rev} {desc} files: {files}\n'
 
 echo % commit new file revisions
 cd src
@@ -80,7 +80,7 @@
 echo % convert again with --filemap
 hg convert --filemap filemap src src-filemap | sed -e 's/connecting to.*cvsrepo/connecting to cvsrepo/g'
 hgcat b/c
-hg -R src-filemap log --template '#rev# #desc# files: #files#\n'
+hg -R src-filemap log --template '{rev} {desc} files: {files}\n'
 
 echo % commit branch
 cd src
@@ -100,7 +100,7 @@
 echo % convert again with --filemap
 hg convert --filemap filemap src src-filemap | sed -e 's/connecting to.*cvsrepo/connecting to cvsrepo/g'
 hgcat b/c
-hg -R src-filemap log --template '#rev# #desc# files: #files#\n'
+hg -R src-filemap log --template '{rev} {desc} files: {files}\n'
 
 echo % commit a new revision with funny log message
 cd src
@@ -116,7 +116,7 @@
 hg convert src src-hg | sed -e 's/connecting to.*cvsrepo/connecting to cvsrepo/g'
 
 echo "graphlog = " >> $HGRCPATH
-hg -R src-hg glog --template '#rev# (#branches#) #desc# files: #files#\n'
+hg -R src-hg glog --template '{rev} ({branches}) {desc} files: {files}\n'
 
 echo % testing debugcvsps
 cd src