Show More
| @@ -16,6 +16,7 b' XXX copied from test-convert-cvs-synthet' | |||
|
|
16 | 16 | |
|
|
17 | 17 | $ cvsci() |
|
|
18 | 18 | > { |
|
|
19 | > sleep 1 | |
|
|
19 | 20 | > cvs -f ci "$@" > /dev/null |
|
|
20 | 21 | > } |
|
|
21 | 22 | |
| @@ -53,7 +54,6 b' create two release branches' | |||
|
|
53 | 54 | modify file1 on branch v1_0 |
|
|
54 | 55 | |
|
|
55 | 56 | $ cvscall -Q update -rv1_0 |
|
|
56 | $ sleep 1 | |
|
|
57 | 57 | $ echo "change" >> file1 |
|
|
58 | 58 | $ cvsci -m"add text" |
|
|
59 | 59 | cvs commit: Examining . |
| @@ -96,7 +96,6 b' non-merged change on trunk' | |||
|
|
96 | 96 | this will create rev 1.3 |
|
|
97 | 97 | change on trunk to backport |
|
|
98 | 98 | |
|
|
99 | $ sleep 1 | |
|
|
100 | 99 | $ echo "backport me" >> file1 |
|
|
101 | 100 | $ cvsci -m"add other text" file1 |
|
|
102 | 101 | $ cvscall log file1 |
| @@ -150,7 +149,6 b' backport trunk change to v1_1' | |||
|
|
150 | 149 | fix bug on v1_1, merge to trunk with error |
|
|
151 | 150 | |
|
|
152 | 151 | $ cvscall -Q update -rv1_1 |
|
|
153 | $ sleep 1 | |
|
|
154 | 152 | $ echo "merge forward" >> file1 |
|
|
155 | 153 | $ cvscall -Q tag unmerged |
|
|
156 | 154 | $ cvsci -m"fix file1" |
General Comments 0
You need to be logged in to leave comments.
Login now