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

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

diff -r e93ab347c814 -r e8cb1fa0d4a9 tests/test-convert-cvsnt-mergepoints
--- 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 ..