Mercurial > hg
comparison tests/test-convert-cvsnt-mergepoints @ 8820:e8cb1fa0d4a9
test-convert-cvsnt-mergepoints: make it work on OS X.
- don't create file 'cvs' where directory 'CVS' already exists
author | Greg Ward <greg-hg@gerg.ca> |
---|---|
date | Mon, 15 Jun 2009 20:35:19 -0400 |
parents | e93ab347c814 |
children | c66e324d3961 |
comparison
equal
deleted
inserted
replaced
8819:e93ab347c814 | 8820:e8cb1fa0d4a9 |
---|---|
90 cvscall -Q update -P -A | 90 cvscall -Q update -P -A |
91 filterpath cvscall -Q update -P -jMYBRANCH1_2 | 91 filterpath cvscall -Q update -P -jMYBRANCH1_2 |
92 cvsci -m "merge2" | 92 cvsci -m "merge2" |
93 | 93 |
94 REALCVS=`which cvs` | 94 REALCVS=`which cvs` |
95 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 | 95 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 |
96 chmod +x cvs | 96 chmod +x ../cvs |
97 PATH=.:${PATH} hg debugcvsps --parents foo | sed -e 's/Author:.*/Author:/' -e 's/Date:.*/Date:/' | 97 PATH=..:${PATH} hg debugcvsps --parents foo | sed -e 's/Author:.*/Author:/' -e 's/Date:.*/Date:/' |
98 | 98 |
99 cd .. | 99 cd .. |