Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-convert-cvsnt-mergepoints: make it work on OS X.
authorGreg Ward <greg-hg@gerg.ca>
Mon, 15 Jun 2009 20:35:19 -0400
changeset 8820 e8cb1fa0d4a9
parent 8819 e93ab347c814
child 8821 c66e324d3961
test-convert-cvsnt-mergepoints: make it work on OS X. - don't create file 'cvs' where directory 'CVS' already exists
tests/test-convert-cvsnt-mergepoints file | annotate | diff | comparison | revisions 
--- a/tests/test-convert-cvsnt-mergepoints	Mon Jun 15 20:35:19 2009 -0400
+++ b/tests/test-convert-cvsnt-mergepoints	Mon Jun 15 20:35:19 2009 -0400
@@ -92,8 +92,8 @@
 cvsci -m "merge2"
 
 REALCVS=`which cvs`
-echo "for x in \$*; do if [ \"\$x\" = \"rlog\" ]; then echo \"RCS file: $CVSROOT/foo/foo.txt,v\"; cat $TESTDIR/test-convert-cvsnt-mergepoints.rlog; exit 0; fi; done; $REALCVS \$*" > cvs
-chmod +x cvs
-PATH=.:${PATH} hg debugcvsps --parents foo | sed -e 's/Author:.*/Author:/' -e 's/Date:.*/Date:/'
+echo "for x in \$*; do if [ \"\$x\" = \"rlog\" ]; then echo \"RCS file: $CVSROOT/foo/foo.txt,v\"; cat $TESTDIR/test-convert-cvsnt-mergepoints.rlog; exit 0; fi; done; $REALCVS \$*" > ../cvs
+chmod +x ../cvs
+PATH=..:${PATH} hg debugcvsps --parents foo | sed -e 's/Author:.*/Author:/' -e 's/Date:.*/Date:/'
 
 cd ..
mercurial