[PATCH 3 of 4] test-convert-cvsnt-mergepoints: make it work on OS X

Greg Ward greg-hg at gerg.ca
Mon Jun 15 19:36:39 CDT 2009


# HG changeset patch
# User Greg Ward <greg-hg at gerg.ca>
# Date 1245112519 14400
# Node ID c8c9d067d2fe45d1518f11aa6eeb8e1cc3c4ff1d
# Parent  1522049e47f9acc92002c890126dd731d3371e3d
test-convert-cvsnt-mergepoints: make it work on OS X.

- don't create file 'cvs' where directory 'CVS' already exists

diff --git a/tests/test-convert-cvsnt-mergepoints b/tests/test-convert-cvsnt-mergepoints
--- a/tests/test-convert-cvsnt-mergepoints
+++ b/tests/test-convert-cvsnt-mergepoints
@@ -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 ..


More information about the Mercurial-devel mailing list