[PATCH 1 of 4] Rename CVSNT "mergepoints" test and make it executable

[Greg Ward]

# HG changeset patch
# User Greg Ward <greg-hg at gerg.ca>
# Date 1245112519 14400
# Node ID dc97e5bdc7b37fc5a2f1eb2fc29f2ee0a00c8db6
# Parent  a7c4eb0cc0ede2880e3c1065bb698f7db1e649b9
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

diff --git a/tests/test-convert-cvs-builtincvsps-cvsnt-mergepoints b/tests/test-convert-cvsnt-mergepoints
old mode 100644
new mode 100755
rename from tests/test-convert-cvs-builtincvsps-cvsnt-mergepoints
rename to tests/test-convert-cvsnt-mergepoints
--- a/tests/test-convert-cvs-builtincvsps-cvsnt-mergepoints
+++ b/tests/test-convert-cvsnt-mergepoints
@@ -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:/'
 
diff --git a/tests/test-convert-cvs-builtincvsps-cvsnt-mergepoints.out b/tests/test-convert-cvsnt-mergepoints.out
rename from tests/test-convert-cvs-builtincvsps-cvsnt-mergepoints.out
rename to tests/test-convert-cvsnt-mergepoints.out
--- a/tests/test-convert-cvs-builtincvsps-cvsnt-mergepoints.out
+++ b/tests/test-convert-cvsnt-mergepoints.out
@@ -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
diff --git a/tests/test-convert-cvs-builtincvsps-cvsnt-mergepoints.rlog b/tests/test-convert-cvsnt-mergepoints.rlog
rename from tests/test-convert-cvs-builtincvsps-cvsnt-mergepoints.rlog
rename to tests/test-convert-cvsnt-mergepoints.rlog