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

tests/test-convert-cvsnt-mergepoints

@@ -1,80 +1,80 b''
 #!/bin/sh
 
 "$TESTDIR/hghave" cvs || exit 80
 
 cvscall()
 {
     cvs -f "$@"
 }
 
 hgcat()
 {
     hg --cwd src-hg cat -r tip "$1"
 }
 
 echo "[extensions]" >> $HGRCPATH
 echo "convert = " >> $HGRCPATH
 echo "graphlog = " >> $HGRCPATH
 echo "[convert]" >> $HGRCPATH
 echo "cvsps=builtin" >> $HGRCPATH
 
 echo % create cvs repository
 mkdir cvsmaster
 cd cvsmaster
 CVSROOT=`pwd`
 export CVSROOT
 CVS_OPTIONS=-f
 export CVS_OPTIONS
 cd ..
 
 cvscall -q -d "$CVSROOT" init
 
 cvscall -q checkout -d cvsworktmp .
 cd cvsworktmp
 mkdir foo
 cvscall -q add foo | sed -e 's/Directory .* added to the repository//g'
 cd foo
 echo foo > foo.txt
 cvscall -q add foo.txt 
 cvscall -q ci -m "foo.txt" | sed 's/.*,v.*/checking in/g'
  
 cd ../..
 rm -rf cvsworktmp
 
 cvscall -q checkout -d cvswork foo
 
 cd cvswork
 
 cvscall -q rtag -b -R MYBRANCH1 foo
 cvscall -q up -P -r MYBRANCH1
 echo bar > foo.txt
 cvscall -q ci -m "bar" | sed 's/.*,v.*/checking in/g'
 echo baz > foo.txt
 cvscall -q ci -m "baz" | sed 's/.*,v.*/checking in/g'
 
 cvscall -q rtag -b -R -r MYBRANCH1 MYBRANCH1_2 foo
 cvscall -q up -P -r MYBRANCH1_2
 
 echo bazzie > foo.txt
 cvscall -q ci -m "bazzie" | sed 's/.*,v.*/checking in/g'
 
 cvscall -q rtag -b -R MYBRANCH1_1 foo
 cvscall -q up -P -r MYBRANCH1_1
 
 echo quux > foo.txt
 cvscall -q ci -m "quux" | sed 's/.*,v.*/checking in/g'
 cvscall -q up -P -jMYBRANCH1 | sed 's/RCS file: .*,v/merging MYBRANCH1/g'
 echo xyzzy > foo.txt
 cvscall -q ci -m "merge" | sed 's/.*,v.*/checking in/g'
 
 cvscall -q up -P -A
 
 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:/'
 
 cd ..

tests/test-convert-cvsnt-mergepoints.out

@@ -1,138 +1,140 b''
 % create cvs repository
 U cvsworktmp/CVSROOT/checkoutlist
 U cvsworktmp/CVSROOT/commitinfo
 U cvsworktmp/CVSROOT/config
 U cvsworktmp/CVSROOT/cvswrappers
 U cvsworktmp/CVSROOT/loginfo
 U cvsworktmp/CVSROOT/modules
 U cvsworktmp/CVSROOT/notify
 U cvsworktmp/CVSROOT/postadmin
 U cvsworktmp/CVSROOT/postproxy
 U cvsworktmp/CVSROOT/posttag
 U cvsworktmp/CVSROOT/postwatch
 U cvsworktmp/CVSROOT/preproxy
 U cvsworktmp/CVSROOT/rcsinfo
 U cvsworktmp/CVSROOT/taginfo
 U cvsworktmp/CVSROOT/verifymsg
 
 cvs add: use `cvs commit' to add this file permanently
 checking in
 initial revision: 1.1
 U cvswork/foo.txt
 checking in
 new revision: 1.1.2.1; previous revision: 1.1
 checking in
 new revision: 1.1.2.2; previous revision: 1.1.2.1
 checking in
 new revision: 1.1.2.2.2.1; previous revision: 1.1.2.2
 U foo.txt
 checking in
 new revision: 1.1.4.1; previous revision: 1.1
 rcsmerge: warning: conflicts during merge
 merging MYBRANCH1
 retrieving revision 1.1
 retrieving revision 1.1.2.2
 Merging differences between 1.1 and 1.1.2.2 into foo.txt
 checking in
 new revision: 1.1.4.2; previous revision: 1.1.4.1
 U foo.txt
 merging MYBRANCH1_2
 retrieving revision 1.1
 retrieving revision 1.1.2.2.2.1
 Merging differences between 1.1 and 1.1.2.2.2.1 into foo.txt
 checking in
 new revision: 1.2; previous revision: 1.1
 collecting CVS rlog
 7 log entries
 creating changesets
 7 changeset entries
 ---------------------
 PatchSet 1 
 Date:
 Author:
 Branch: HEAD
 Tag: (none) 
+Branchpoints: MYBRANCH1_1, MYBRANCH1 
 Log:
 foo.txt
 
 Members: 
 	foo.txt:INITIAL->1.1 
 
 ---------------------
 PatchSet 2 
 Date:
 Author:
 Branch: MYBRANCH1
 Tag: (none) 
 Parent: 1
 Log:
 bar
 
 Members: 
 	foo.txt:1.1->1.1.2.1 
 
 ---------------------
 PatchSet 3 
 Date:
 Author:
 Branch: MYBRANCH1
 Tag: (none) 
+Branchpoints: MYBRANCH1_2 
 Parent: 2
 Log:
 baz
 
 Members: 
 	foo.txt:1.1.2.1->1.1.2.2 
 
 ---------------------
 PatchSet 4 
 Date:
 Author:
 Branch: MYBRANCH1_1
 Tag: (none) 
 Parent: 1
 Log:
 quux
 
 Members: 
 	foo.txt:1.1->1.1.4.1 
 
 ---------------------
 PatchSet 5 
 Date:
 Author:
 Branch: MYBRANCH1_2
 Tag: (none) 
 Parent: 3
 Log:
 bazzie
 
 Members: 
 	foo.txt:1.1.2.2->1.1.2.2.2.1 
 
 ---------------------
 PatchSet 6 
 Date:
 Author:
 Branch: HEAD
 Tag: (none) 
 Parents: 1,5
 Log:
 merge
 
 Members: 
 	foo.txt:1.1->1.2 
 
 ---------------------
 PatchSet 7 
 Date:
 Author:
 Branch: MYBRANCH1_1
 Tag: (none) 
 Parents: 4,3
 Log:
 merge
 
 Members: 
 	foo.txt:1.1.4.1->1.1.4.2