From bc8b9b1849a500312067a278cf9031c0f31c8976 Mon Sep 17 00:00:00 2001
From: Greg Ward <greg-hg@gerg.ca>
Date: Mon, 15 Jun 2009 20:35:19 -0400
Subject: [PATCH] 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
---
 ...incvsps-cvsnt-mergepoints => test-convert-cvsnt-mergepoints} | 2 +-
 ...cvsnt-mergepoints.out => test-convert-cvsnt-mergepoints.out} | 2 ++
 ...snt-mergepoints.rlog => test-convert-cvsnt-mergepoints.rlog} | 0
 3 files changed, 3 insertions(+), 1 deletion(-)
 rename tests/{test-convert-cvs-builtincvsps-cvsnt-mergepoints => test-convert-cvsnt-mergepoints} (92%)
 mode change 100644 => 100755
 rename tests/{test-convert-cvs-builtincvsps-cvsnt-mergepoints.out => test-convert-cvsnt-mergepoints.out} (97%)
 rename tests/{test-convert-cvs-builtincvsps-cvsnt-mergepoints.rlog => test-convert-cvsnt-mergepoints.rlog} (100%)

diff --git a/tests/test-convert-cvs-builtincvsps-cvsnt-mergepoints b/tests/test-convert-cvsnt-mergepoints
old mode 100644
new mode 100755
similarity index 92%
rename from tests/test-convert-cvs-builtincvsps-cvsnt-mergepoints
rename to tests/test-convert-cvsnt-mergepoints
index bf35cb4450..e4df38646e
--- a/tests/test-convert-cvs-builtincvsps-cvsnt-mergepoints
+++ b/tests/test-convert-cvsnt-mergepoints
@@ -73,7 +73,7 @@ cvscall -q up -P -jMYBRANCH1_2 | sed 's/RCS file: .*,v/merging MYBRANCH1_2/g'
 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
similarity index 97%
rename from tests/test-convert-cvs-builtincvsps-cvsnt-mergepoints.out
rename to tests/test-convert-cvsnt-mergepoints.out
index 3e9dc2474f..ec603a5d4b 100644
--- a/tests/test-convert-cvs-builtincvsps-cvsnt-mergepoints.out
+++ b/tests/test-convert-cvsnt-mergepoints.out
@@ -52,6 +52,7 @@ Date:
 Author:
 Branch: HEAD
 Tag: (none) 
+Branchpoints: MYBRANCH1_1, MYBRANCH1 
 Log:
 foo.txt
 
@@ -77,6 +78,7 @@ Date:
 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
similarity index 100%
rename from tests/test-convert-cvs-builtincvsps-cvsnt-mergepoints.rlog
rename to tests/test-convert-cvsnt-mergepoints.rlog