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
#!/bin/sh
"$TESTDIR/hghave" inotify || exit 80
hg init
echo "[extensions]" > .hg/hgrc
echo "inotify=" >> .hg/hgrc
hg inserve -d --pid-file .hg/inotify.pid
echo a > a
hg ci -Aqm0
hg co -q null
hg co -q
hg st
cat a
kill `cat .hg/inotify.pid`