diff options
Diffstat (limited to 'tests/test-convert-cvsnt-mergepoints.t')
| -rw-r--r-- | tests/test-convert-cvsnt-mergepoints.t | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/tests/test-convert-cvsnt-mergepoints.t b/tests/test-convert-cvsnt-mergepoints.t index 1e3d02b..6e945da 100644 --- a/tests/test-convert-cvsnt-mergepoints.t +++ b/tests/test-convert-cvsnt-mergepoints.t @@ -91,8 +91,6 @@ script) $ echo xyzzy > foo.txt $ cvsci -m "merge1+clobber" foo.txt -#if unix-permissions - return to trunk and merge MYBRANCH1_2 $ cvscall -Q update -P -A @@ -103,7 +101,7 @@ return to trunk and merge MYBRANCH1_2 Merging differences between 1.1 and 1.1.2.2.2.1 into foo.txt $ cvsci -m "merge2" foo.txt $ 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 + $ 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 collecting CVS rlog @@ -202,6 +200,3 @@ return to trunk and merge MYBRANCH1_2 Members: foo.txt:1.1.4.1->1.1.4.2 -#endif - - $ cd .. |