view tests/test-convert-cvs-synthetic.out @ 7963:7da575c56710

i18n-de: docu for resolve

% create cvs repository with one project
cvs checkout: Updating proj
% create file1 on the trunk
cvs add: scheduling file `file1' for addition
cvs add: use `cvs commit' to add this file permanently
*REPO*/proj/file1,v  <--  file1
initial revision: 1.1
% create two branches
cvs tag: Tagging .
T file1
cvs tag: Tagging .
T file1
% create file2 on branch v1_0
cvs update: Updating .
cvs add: scheduling file `file2' for addition on branch `v1_0'
cvs add: use `cvs commit' to add this file permanently
*REPO*/proj/Attic/file2,v  <--  file2
new revision: 1.1.2.1; previous revision: 1.1
% create file3, file4 on branch v1_1
cvs update: Updating .
cvs update: `file2' is no longer in the repository
cvs add: scheduling file `file3' for addition on branch `v1_1'
cvs add: scheduling file `file4' for addition on branch `v1_1'
cvs add: use `cvs commit' to add these files permanently
*REPO*/proj/Attic/file3,v  <--  file3
new revision: 1.1.2.1; previous revision: 1.1
*REPO*/proj/Attic/file4,v  <--  file4
new revision: 1.1.2.1; previous revision: 1.1
% merge file2 from v1_0 to v1_1
cvs update: Updating .
U file2
cvs commit: Examining .
*REPO*/proj/Attic/file2,v  <--  file2
new revision: 1.1.4.2; previous revision: 1.1.4.1
% convert to hg
initializing destination proj.hg repository
using builtin cvsps
collecting CVS rlog
9 log entries
creating changesets
4 changeset entries
connecting to *REPO*
scanning source...
sorting...
converting...
3 add file1 on trunk
2 add file2 on branch v1_0
1 add file3, file4 on branch v1_1
0 merge file2 from v1_0 to v1_1
% hg log output
3 merge file2 from v1_0 to v1_1
2 add file3, file4 on branch v1_1
1 add file2 on branch v1_0
0 add file1 on trunk