1 % create cvs repository |
1 % create cvs repository |
2 U cvsworktmp/CVSROOT/checkoutlist |
2 cvs -f -Q -d *REPO* init |
3 U cvsworktmp/CVSROOT/commitinfo |
3 % checkout #1: add foo.txt |
4 U cvsworktmp/CVSROOT/config |
4 cvs -f -Q checkout -d cvsworktmp . |
5 U cvsworktmp/CVSROOT/cvswrappers |
5 cvs -f -Q add foo |
6 U cvsworktmp/CVSROOT/loginfo |
6 cvs -f -Q add foo.txt |
7 U cvsworktmp/CVSROOT/modules |
7 cvs -f ci -m foo.txt |
8 U cvsworktmp/CVSROOT/notify |
|
9 U cvsworktmp/CVSROOT/postadmin |
|
10 U cvsworktmp/CVSROOT/postproxy |
|
11 U cvsworktmp/CVSROOT/posttag |
|
12 U cvsworktmp/CVSROOT/postwatch |
|
13 U cvsworktmp/CVSROOT/preproxy |
|
14 U cvsworktmp/CVSROOT/rcsinfo |
|
15 U cvsworktmp/CVSROOT/taginfo |
|
16 U cvsworktmp/CVSROOT/verifymsg |
|
17 |
|
18 cvs add: use `cvs commit' to add this file permanently |
|
19 checking in |
|
20 initial revision: 1.1 |
8 initial revision: 1.1 |
21 U cvswork/foo.txt |
9 % checkout #2: create MYBRANCH1 and modify foo.txt on it |
22 checking in |
10 cvs -f -Q checkout -d cvswork foo |
|
11 cvs -f -q rtag -b -R MYBRANCH1 foo |
|
12 cvs -f -Q update -P -r MYBRANCH1 |
|
13 cvs -f ci -m bar |
23 new revision: 1.1.2.1; previous revision: 1.1 |
14 new revision: 1.1.2.1; previous revision: 1.1 |
24 checking in |
15 cvs -f ci -m baz |
25 new revision: 1.1.2.2; previous revision: 1.1.2.1 |
16 new revision: 1.1.2.2; previous revision: 1.1.2.1 |
26 checking in |
17 % create MYBRANCH1_2 and modify foo.txt some more |
|
18 cvs -f -q rtag -b -R -r MYBRANCH1 MYBRANCH1_2 foo |
|
19 cvs -f -Q update -P -r MYBRANCH1_2 |
|
20 cvs -f ci -m bazzie |
27 new revision: 1.1.2.2.2.1; previous revision: 1.1.2.2 |
21 new revision: 1.1.2.2.2.1; previous revision: 1.1.2.2 |
28 U foo.txt |
22 % create MYBRANCH1_1 and modify foo.txt yet again |
29 checking in |
23 cvs -f -q rtag -b -R MYBRANCH1_1 foo |
|
24 cvs -f -Q update -P -r MYBRANCH1_1 |
|
25 cvs -f ci -m quux |
30 new revision: 1.1.4.1; previous revision: 1.1 |
26 new revision: 1.1.4.1; previous revision: 1.1 |
|
27 % merge MYBRANCH1 to MYBRANCH1_1 |
31 rcsmerge: warning: conflicts during merge |
28 rcsmerge: warning: conflicts during merge |
32 merging MYBRANCH1 |
29 cvs -f -Q update -P -jMYBRANCH1 |
|
30 RCS file: *REPO*/foo/foo.txt,v |
33 retrieving revision 1.1 |
31 retrieving revision 1.1 |
34 retrieving revision 1.1.2.2 |
32 retrieving revision 1.1.2.2 |
35 Merging differences between 1.1 and 1.1.2.2 into foo.txt |
33 Merging differences between 1.1 and 1.1.2.2 into foo.txt |
36 checking in |
34 cvs -f ci -m merge1 |
37 new revision: 1.1.4.2; previous revision: 1.1.4.1 |
35 new revision: 1.1.4.2; previous revision: 1.1.4.1 |
38 U foo.txt |
36 % return to trunk and merge MYBRANCH1_2 |
39 merging MYBRANCH1_2 |
37 cvs -f -Q update -P -A |
|
38 cvs -f -Q update -P -jMYBRANCH1_2 |
|
39 RCS file: *REPO*/foo/foo.txt,v |
40 retrieving revision 1.1 |
40 retrieving revision 1.1 |
41 retrieving revision 1.1.2.2.2.1 |
41 retrieving revision 1.1.2.2.2.1 |
42 Merging differences between 1.1 and 1.1.2.2.2.1 into foo.txt |
42 Merging differences between 1.1 and 1.1.2.2.2.1 into foo.txt |
43 checking in |
43 cvs -f ci -m merge2 |
44 new revision: 1.2; previous revision: 1.1 |
44 new revision: 1.2; previous revision: 1.1 |
45 collecting CVS rlog |
45 collecting CVS rlog |
46 7 log entries |
46 7 log entries |
47 creating changesets |
47 creating changesets |
48 7 changeset entries |
48 7 changeset entries |