view tests/test-convert-cvs-branch.out @ 8564:6b9ec23b09fc

named branches: improve pre-push logic (issue736)

Each named branch is considered separately, and the push is allowed if
no new branch heads are created for any named branch to be pushed.

Due to some tests's use of --debug, their output will change after this
addition. This has been fixed as well.

Co-contributor: Henrik Stuart <[e-mail]>

% create cvs repository
% Create a new project


N src/a
N src/b
No conflicts created by this import
cvs checkout: Updating src
U src/a
U src/b
% Branch the project
cvs tag: Tagging .
T a
T b
cvs update: Updating .
% Modify file a, then b, then a
cvs commit: Examining .
checking in src/a,v
cvs commit: Examining .
checking in src/b,v
cvs commit: Examining .
checking in src/a,v
% Convert
assuming destination src-hg
initializing destination src-hg repository
connecting to cvsrepo
scanning source...
using builtin cvsps
collecting CVS rlog
7 log entries
creating changesets
5 changeset entries
sorting...
converting...
4 Initial revision
3 init
2 mod a
1 mod b
0 mod a again
updating tags
% Check the result
o  5 () update tags files: .hgtags
|
| o  4 (BRANCH) mod a again files: a
| |
| o  3 (BRANCH) mod b files: b
| |
| o  2 (BRANCH) mod a files: a
| |
| o  1 (v0) init files:
|/
o  0 () Initial revision files: a b