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
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
created new head
@ 4:r2
|
o 3:r1
|
| o 2:l1
|/
o 1:c2
|
o 0:c1
% Rebase with no arguments - single revision in source branch
1 files updated, 0 files merged, 2 files removed, 0 files unresolved
saving bundle to
adding branch
adding changesets
adding manifests
adding file changes
added 3 changesets with 3 changes to 3 files
rebase completed
@ 4:l1
|
o 3:r2
|
o 2:r1
|
o 1:c2
|
o 0:c1
0 files updated, 0 files merged, 2 files removed, 0 files unresolved
created new head
@ 4:r1
|
| o 3:l2
| |
| o 2:l1
|/
o 1:c2
|
o 0:c1
% Rebase with no arguments - single revision in target branch
2 files updated, 0 files merged, 1 files removed, 0 files unresolved
saving bundle to
adding branch
adding changesets
adding manifests
adding file changes
added 3 changesets with 3 changes to 3 files
rebase completed
@ 4:l2
|
o 3:l1
|
o 2:r1
|
o 1:c2
|
o 0:c1