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

     1

#!/bin/sh

     2

     3

# Test for changeset ba7c74081861

     4

# (update dirstate correctly for non-branchmerge updates)

     5

hg init a

     6

cd a

     7

echo a > a

     8

hg add a

     9

hg commit -m a

    10

cd ..

    11

hg clone a b

    12

cd a

    13

hg mv a b

    14

hg commit -m move

    15

echo b >> b

    16

hg commit -m b

    17

cd ../b

    18

hg pull ../a

    19

hg update