Skip to content
Snippets Groups Projects
Commit 727f7aae authored by Greg Ward's avatar Greg Ward
Browse files

Rename CVSNT "mergepoints" test and make it executable.

- rename test-convert-cvs-builtincvsps-cvsnt-mergepoints
  (and related files) to test-convert-cvsnt-mergepoints
- this ensures that the test will be run, but does NOT make
  it pass: in particularly, it fails regularly for me due
  to the inconsistent behaviour of CVS itself
- expect "Branchpoints:" in debugcvsps output
parent 6c9dce20
No related branches found
No related tags found
No related merge requests found
......@@ -73,7 +73,7 @@
cvscall -q ci -m "merge" | sed 's/.*,v.*/checking in/g'
REALCVS=`which cvs`
echo "for x in \$*; do if [ \"\$x\" = \"rlog\" ]; then echo \"RCS file: $CVSROOT/foo/foo.txt,v\"; cat $TESTDIR/test-convert-cvs-builtincvsps-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 | sed -e 's/Author:.*/Author:/' -e 's/Date:.*/Date:/'
......
......@@ -52,6 +52,7 @@
Author:
Branch: HEAD
Tag: (none)
Branchpoints: MYBRANCH1_1, MYBRANCH1
Log:
foo.txt
......@@ -77,6 +78,7 @@
Author:
Branch: MYBRANCH1
Tag: (none)
Branchpoints: MYBRANCH1_2
Parent: 2
Log:
baz
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment