|
1 % create cvs repository with one project |
|
2 cvs checkout: Updating proj |
|
3 % create file1 on the trunk |
|
4 cvs add: scheduling file `file1' for addition |
|
5 cvs add: use 'cvs commit' to add this file permanently |
|
6 RCS file: *REPO*/proj/file1,v |
|
7 done |
|
8 Checking in file1; |
|
9 *REPO*/proj/file1,v <-- file1 |
|
10 initial revision: 1.1 |
|
11 done |
|
12 % create two branches |
|
13 cvs tag: Tagging . |
|
14 T file1 |
|
15 cvs tag: Tagging . |
|
16 T file1 |
|
17 % create file2 on branch v1_0 |
|
18 cvs update: Updating . |
|
19 cvs add: scheduling file `file2' for addition on branch `v1_0' |
|
20 cvs add: use 'cvs commit' to add this file permanently |
|
21 RCS file: *REPO*/proj/Attic/file2,v |
|
22 done |
|
23 Checking in file2; |
|
24 *REPO*/proj/Attic/file2,v <-- file2 |
|
25 new revision: 1.1.2.1; previous revision: 1.1 |
|
26 done |
|
27 % create file3, file4 on branch v1_1 |
|
28 cvs update: Updating . |
|
29 cvs update: file2 is no longer in the repository |
|
30 cvs add: scheduling file `file3' for addition on branch `v1_1' |
|
31 cvs add: scheduling file `file4' for addition on branch `v1_1' |
|
32 cvs add: use 'cvs commit' to add these files permanently |
|
33 RCS file: *REPO*/proj/Attic/file3,v |
|
34 done |
|
35 Checking in file3; |
|
36 *REPO*/proj/Attic/file3,v <-- file3 |
|
37 new revision: 1.1.2.1; previous revision: 1.1 |
|
38 done |
|
39 RCS file: *REPO*/proj/Attic/file4,v |
|
40 done |
|
41 Checking in file4; |
|
42 *REPO*/proj/Attic/file4,v <-- file4 |
|
43 new revision: 1.1.2.1; previous revision: 1.1 |
|
44 done |
|
45 % merge file2 from v1_0 to v1_1 |
|
46 cvs update: Updating . |
|
47 U file2 |
|
48 cvs commit: Examining . |
|
49 Checking in file2; |
|
50 *REPO*/proj/Attic/file2,v <-- file2 |
|
51 new revision: 1.1.4.2; previous revision: 1.1.4.1 |
|
52 done |
|
53 % convert to hg |
|
54 initializing destination proj.hg repository |
|
55 using builtin cvsps |
|
56 collecting CVS rlog |
|
57 9 log entries |
|
58 creating changesets |
|
59 4 changeset entries |
|
60 connecting to *REPO* |
|
61 scanning source... |
|
62 sorting... |
|
63 converting... |
|
64 3 add file1 on trunk |
|
65 2 add file2 on branch v1_0 |
|
66 1 add file3, file4 on branch v1_1 |
|
67 0 merge file2 from v1_0 to v1_1 |
|
68 % hg log output |
|
69 3 merge file2 from v1_0 to v1_1 |
|
70 2 add file3, file4 on branch v1_1 |
|
71 1 add file2 on branch v1_0 |
|
72 0 add file1 on trunk |