1 % create cvs repository with one project |
|
2 cvs -f -q -d *REPO* init |
|
3 % populate cvs repository |
|
4 cvs -f -Q co proj |
|
5 cvs -f -Q add file1 |
|
6 cvs -f ci -madd file1 on trunk |
|
7 % create two release branches |
|
8 cvs -f -q tag -b v1_0 |
|
9 T file1 |
|
10 cvs -f -q tag -b v1_1 |
|
11 T file1 |
|
12 % modify file1 on branch v1_0 |
|
13 cvs -f -Q update -rv1_0 |
|
14 cvs -f ci -madd text |
|
15 % make unrelated change on v1_1 |
|
16 cvs -f -Q update -rv1_1 |
|
17 cvs -f -Q add unrelated |
|
18 cvs -f ci -munrelated change |
|
19 % merge file1 to v1_1 |
|
20 cvs -f -Q update -jv1_0 |
|
21 RCS file: *REPO*/proj/file1,v |
|
22 retrieving revision 1.1 |
|
23 retrieving revision 1.1.2.1 |
|
24 Merging differences between 1.1 and 1.1.2.1 into file1 |
|
25 cvs -f ci -madd text [MERGE from v1_0] |
|
26 % merge change to trunk |
|
27 cvs -f -Q update -A |
|
28 cvs -f -Q update -jv1_1 |
|
29 RCS file: *REPO*/proj/file1,v |
|
30 retrieving revision 1.1 |
|
31 retrieving revision 1.1.4.1 |
|
32 Merging differences between 1.1 and 1.1.4.1 into file1 |
|
33 cvs -f ci -madd text [MERGE from v1_1] |
|
34 % non-merged change on trunk |
|
35 cvs -f -Q add file2 |
|
36 cvs -f ci -madd file2 on trunk file2 |
|
37 % change on trunk to backport |
|
38 cvs -f ci -madd other text file1 |
|
39 revision 1.3 |
|
40 add other text |
|
41 ---------------------------- |
|
42 revision 1.2 |
|
43 add text [MERGE from v1_1] |
|
44 ---------------------------- |
|
45 revision 1.1 |
|
46 branches: 1.1.2; 1.1.4; |
|
47 add file1 on trunk |
|
48 ---------------------------- |
|
49 revision 1.1.4.1 |
|
50 add text [MERGE from v1_0] |
|
51 ---------------------------- |
|
52 revision 1.1.2.1 |
|
53 add text |
|
54 ============================================================================= |
|
55 % backport trunk change to v1_1 |
|
56 cvs -f -Q update -rv1_1 |
|
57 cvs -f -Q update -j1.2 -j1.3 file1 |
|
58 RCS file: *REPO*/proj/file1,v |
|
59 retrieving revision 1.2 |
|
60 retrieving revision 1.3 |
|
61 Merging differences between 1.2 and 1.3 into file1 |
|
62 cvs -f ci -madd other text [MERGE from HEAD] file1 |
|
63 % fix bug on v1_1, merge to trunk with error |
|
64 cvs -f -Q update -rv1_1 |
|
65 cvs -f -Q tag unmerged |
|
66 cvs -f ci -mfix file1 |
|
67 cvs -f -Q update -A |
|
68 cvs -f -Q update -junmerged -jv1_1 |
|
69 RCS file: *REPO*/proj/file1,v |
|
70 retrieving revision 1.1.4.2 |
|
71 retrieving revision 1.1.4.3 |
|
72 Merging differences between 1.1.4.2 and 1.1.4.3 into file1 |
|
73 cvs -f ci -mfix file1 [MERGE from v1-1] |
|
74 % convert to hg |
|
75 warning: CVS commit message references non-existent branch 'v1-1': |
|
76 fix file1 [MERGE from v1-1] |
|
77 initializing destination proj.hg repository |
|
78 connecting to *REPO* |
|
79 scanning source... |
|
80 collecting CVS rlog |
|
81 12 log entries |
|
82 creating changesets |
|
83 10 changeset entries |
|
84 sorting... |
|
85 converting... |
|
86 9 add file1 on trunk |
|
87 8 add text |
|
88 7 unrelated change |
|
89 6 add text [MERGE from v1_0] |
|
90 5 add text [MERGE from v1_1] |
|
91 4 add file2 on trunk |
|
92 3 add other text |
|
93 2 add other text [MERGE from HEAD] |
|
94 1 fix file1 |
|
95 0 fix file1 [MERGE from v1-1] |
|
96 % complete log |
|
97 9: '' fix file1 [MERGE from v1-1] |
|
98 8: 'v1_1' fix file1 |
|
99 7: 'v1_1' add other text [MERGE from HEAD] |
|
100 6: '' add other text |
|
101 5: '' add file2 on trunk |
|
102 4: '' add text [MERGE from v1_1] |
|
103 3: 'v1_1' add text [MERGE from v1_0] |
|
104 2: 'v1_1' unrelated change |
|
105 1: 'v1_0' add text |
|
106 0: '' add file1 on trunk |
|
107 % graphical log |
|
108 o 9: '' fix file1 [MERGE from v1-1] |
|
109 | |
|
110 | o 8: 'v1_1' fix file1 |
|
111 | | |
|
112 | o 7: 'v1_1' add other text [MERGE from HEAD] |
|
113 |/| |
|
114 o | 6: '' add other text |
|
115 | | |
|
116 o | 5: '' add file2 on trunk |
|
117 | | |
|
118 o | 4: '' add text [MERGE from v1_1] |
|
119 |\| |
|
120 | o 3: 'v1_1' add text [MERGE from v1_0] |
|
121 | |\ |
|
122 +---o 2: 'v1_1' unrelated change |
|
123 | | |
|
124 | o 1: 'v1_0' add text |
|
125 |/ |
|
126 o 0: '' add file1 on trunk |
|
127 |
|