Mercurial > hg
comparison tests/test-branches.t @ 11868:062052b0d737
tests: unify test-branches
author | Martin Geisler <mg@lazybytes.net> |
---|---|
date | Sat, 14 Aug 2010 03:06:52 +0200 |
parents | tests/test-branches@58e040c51231 |
children | 52ec5c813723 |
comparison
equal
deleted
inserted
replaced
11867:20bd477d0e89 | 11868:062052b0d737 |
---|---|
1 $ hg init a | |
2 $ cd a | |
3 $ echo 'root' >root | |
4 $ hg add root | |
5 $ hg commit -d '0 0' -m "Adding root node" | |
6 | |
7 $ echo 'a' >a | |
8 $ hg add a | |
9 $ hg branch a | |
10 marked working directory as branch a | |
11 $ hg commit -d '1 0' -m "Adding a branch" | |
12 | |
13 $ hg branch q | |
14 marked working directory as branch q | |
15 $ echo 'aa' >a | |
16 $ hg branch -C | |
17 reset working directory to branch a | |
18 $ hg commit -d '2 0' -m "Adding to a branch" | |
19 | |
20 $ hg update -C 0 | |
21 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
22 $ echo 'b' >b | |
23 $ hg add b | |
24 $ hg branch b | |
25 marked working directory as branch b | |
26 $ hg commit -d '2 0' -m "Adding b branch" | |
27 | |
28 $ echo 'bh1' >bh1 | |
29 $ hg add bh1 | |
30 $ hg commit -d '3 0' -m "Adding b branch head 1" | |
31 | |
32 $ hg update -C 2 | |
33 1 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
34 $ echo 'bh2' >bh2 | |
35 $ hg add bh2 | |
36 $ hg commit -d '4 0' -m "Adding b branch head 2" | |
37 | |
38 $ echo 'c' >c | |
39 $ hg add c | |
40 $ hg branch c | |
41 marked working directory as branch c | |
42 $ hg commit -d '5 0' -m "Adding c branch" | |
43 | |
44 $ hg branch tip | |
45 abort: the name 'tip' is reserved | |
46 $ hg branch null | |
47 abort: the name 'null' is reserved | |
48 $ hg branch . | |
49 abort: the name '.' is reserved | |
50 | |
51 $ echo 'd' >d | |
52 $ hg add d | |
53 $ hg branch 'a branch name much longer than the default justification used by branches' | |
54 marked working directory as branch a branch name much longer than the default justification used by branches | |
55 $ hg commit -d '6 0' -m "Adding d branch" | |
56 | |
57 $ hg branches | |
58 a branch name much longer than the default justification used by branches 7:10ff5895aa57 | |
59 b 4:aee39cd168d0 | |
60 c 6:589736a22561 (inactive) | |
61 a 5:d8cbc61dbaa6 (inactive) | |
62 default 0:19709c5a4e75 (inactive) | |
63 | |
64 ------- | |
65 | |
66 $ hg branches -a | |
67 a branch name much longer than the default justification used by branches 7:10ff5895aa57 | |
68 b 4:aee39cd168d0 | |
69 | |
70 --- Branch a | |
71 | |
72 $ hg log -b a | |
73 changeset: 5:d8cbc61dbaa6 | |
74 branch: a | |
75 parent: 2:881fe2b92ad0 | |
76 user: test | |
77 date: Thu Jan 01 00:00:04 1970 +0000 | |
78 summary: Adding b branch head 2 | |
79 | |
80 changeset: 2:881fe2b92ad0 | |
81 branch: a | |
82 user: test | |
83 date: Thu Jan 01 00:00:02 1970 +0000 | |
84 summary: Adding to a branch | |
85 | |
86 changeset: 1:dd6b440dd85a | |
87 branch: a | |
88 user: test | |
89 date: Thu Jan 01 00:00:01 1970 +0000 | |
90 summary: Adding a branch | |
91 | |
92 | |
93 ---- Branch b | |
94 | |
95 $ hg log -b b | |
96 changeset: 4:aee39cd168d0 | |
97 branch: b | |
98 user: test | |
99 date: Thu Jan 01 00:00:03 1970 +0000 | |
100 summary: Adding b branch head 1 | |
101 | |
102 changeset: 3:ac22033332d1 | |
103 branch: b | |
104 parent: 0:19709c5a4e75 | |
105 user: test | |
106 date: Thu Jan 01 00:00:02 1970 +0000 | |
107 summary: Adding b branch | |
108 | |
109 | |
110 ---- going to test branch closing | |
111 | |
112 $ hg branches | |
113 a branch name much longer than the default justification used by branches 7:10ff5895aa57 | |
114 b 4:aee39cd168d0 | |
115 c 6:589736a22561 (inactive) | |
116 a 5:d8cbc61dbaa6 (inactive) | |
117 default 0:19709c5a4e75 (inactive) | |
118 $ hg up -C b | |
119 2 files updated, 0 files merged, 4 files removed, 0 files unresolved | |
120 $ echo 'xxx1' >> b | |
121 $ hg commit -d '7 0' -m 'adding cset to branch b' | |
122 $ hg up -C aee39cd168d0 | |
123 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
124 $ echo 'xxx2' >> b | |
125 $ hg commit -d '8 0' -m 'adding head to branch b' | |
126 created new head | |
127 $ echo 'xxx3' >> b | |
128 $ hg commit -d '9 0' -m 'adding another cset to branch b' | |
129 $ hg branches | |
130 b 10:bfbe841b666e | |
131 a branch name much longer than the default justification used by branches 7:10ff5895aa57 | |
132 c 6:589736a22561 (inactive) | |
133 a 5:d8cbc61dbaa6 (inactive) | |
134 default 0:19709c5a4e75 (inactive) | |
135 $ hg heads --closed | |
136 changeset: 10:bfbe841b666e | |
137 branch: b | |
138 tag: tip | |
139 user: test | |
140 date: Thu Jan 01 00:00:09 1970 +0000 | |
141 summary: adding another cset to branch b | |
142 | |
143 changeset: 8:eebb944467c9 | |
144 branch: b | |
145 parent: 4:aee39cd168d0 | |
146 user: test | |
147 date: Thu Jan 01 00:00:07 1970 +0000 | |
148 summary: adding cset to branch b | |
149 | |
150 changeset: 7:10ff5895aa57 | |
151 branch: a branch name much longer than the default justification used by branches | |
152 user: test | |
153 date: Thu Jan 01 00:00:06 1970 +0000 | |
154 summary: Adding d branch | |
155 | |
156 changeset: 6:589736a22561 | |
157 branch: c | |
158 user: test | |
159 date: Thu Jan 01 00:00:05 1970 +0000 | |
160 summary: Adding c branch | |
161 | |
162 changeset: 5:d8cbc61dbaa6 | |
163 branch: a | |
164 parent: 2:881fe2b92ad0 | |
165 user: test | |
166 date: Thu Jan 01 00:00:04 1970 +0000 | |
167 summary: Adding b branch head 2 | |
168 | |
169 changeset: 0:19709c5a4e75 | |
170 user: test | |
171 date: Thu Jan 01 00:00:00 1970 +0000 | |
172 summary: Adding root node | |
173 | |
174 $ hg heads | |
175 changeset: 10:bfbe841b666e | |
176 branch: b | |
177 tag: tip | |
178 user: test | |
179 date: Thu Jan 01 00:00:09 1970 +0000 | |
180 summary: adding another cset to branch b | |
181 | |
182 changeset: 8:eebb944467c9 | |
183 branch: b | |
184 parent: 4:aee39cd168d0 | |
185 user: test | |
186 date: Thu Jan 01 00:00:07 1970 +0000 | |
187 summary: adding cset to branch b | |
188 | |
189 changeset: 7:10ff5895aa57 | |
190 branch: a branch name much longer than the default justification used by branches | |
191 user: test | |
192 date: Thu Jan 01 00:00:06 1970 +0000 | |
193 summary: Adding d branch | |
194 | |
195 changeset: 6:589736a22561 | |
196 branch: c | |
197 user: test | |
198 date: Thu Jan 01 00:00:05 1970 +0000 | |
199 summary: Adding c branch | |
200 | |
201 changeset: 5:d8cbc61dbaa6 | |
202 branch: a | |
203 parent: 2:881fe2b92ad0 | |
204 user: test | |
205 date: Thu Jan 01 00:00:04 1970 +0000 | |
206 summary: Adding b branch head 2 | |
207 | |
208 changeset: 0:19709c5a4e75 | |
209 user: test | |
210 date: Thu Jan 01 00:00:00 1970 +0000 | |
211 summary: Adding root node | |
212 | |
213 $ hg commit -d '9 0' --close-branch -m 'prune bad branch' | |
214 $ hg branches -a | |
215 b 8:eebb944467c9 | |
216 a branch name much longer than the default justification used by branches 7:10ff5895aa57 | |
217 $ hg up -C b | |
218 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
219 $ hg commit -d '9 0' --close-branch -m 'close this part branch too' | |
220 | |
221 --- b branch should be inactive | |
222 | |
223 $ hg branches | |
224 a branch name much longer than the default justification used by branches 7:10ff5895aa57 | |
225 c 6:589736a22561 (inactive) | |
226 a 5:d8cbc61dbaa6 (inactive) | |
227 default 0:19709c5a4e75 (inactive) | |
228 $ hg branches -c | |
229 a branch name much longer than the default justification used by branches 7:10ff5895aa57 | |
230 b 12:2da6583810df (closed) | |
231 c 6:589736a22561 (inactive) | |
232 a 5:d8cbc61dbaa6 (inactive) | |
233 default 0:19709c5a4e75 (inactive) | |
234 $ hg branches -a | |
235 a branch name much longer than the default justification used by branches 7:10ff5895aa57 | |
236 $ hg heads b | |
237 no open branch heads found on branches b | |
238 $ hg heads --closed b | |
239 changeset: 12:2da6583810df | |
240 branch: b | |
241 tag: tip | |
242 parent: 8:eebb944467c9 | |
243 user: test | |
244 date: Thu Jan 01 00:00:09 1970 +0000 | |
245 summary: close this part branch too | |
246 | |
247 changeset: 11:c84627f3c15d | |
248 branch: b | |
249 user: test | |
250 date: Thu Jan 01 00:00:09 1970 +0000 | |
251 summary: prune bad branch | |
252 | |
253 $ echo 'xxx4' >> b | |
254 $ hg commit -d '9 0' -m 'reopen branch with a change' | |
255 reopening closed branch head 12 | |
256 | |
257 --- branch b is back in action | |
258 | |
259 $ hg branches -a | |
260 b 13:6ac12926b8c3 | |
261 a branch name much longer than the default justification used by branches 7:10ff5895aa57 | |
262 | |
263 ---- test heads listings | |
264 | |
265 $ hg heads | |
266 changeset: 13:6ac12926b8c3 | |
267 branch: b | |
268 tag: tip | |
269 user: test | |
270 date: Thu Jan 01 00:00:09 1970 +0000 | |
271 summary: reopen branch with a change | |
272 | |
273 changeset: 7:10ff5895aa57 | |
274 branch: a branch name much longer than the default justification used by branches | |
275 user: test | |
276 date: Thu Jan 01 00:00:06 1970 +0000 | |
277 summary: Adding d branch | |
278 | |
279 changeset: 6:589736a22561 | |
280 branch: c | |
281 user: test | |
282 date: Thu Jan 01 00:00:05 1970 +0000 | |
283 summary: Adding c branch | |
284 | |
285 changeset: 5:d8cbc61dbaa6 | |
286 branch: a | |
287 parent: 2:881fe2b92ad0 | |
288 user: test | |
289 date: Thu Jan 01 00:00:04 1970 +0000 | |
290 summary: Adding b branch head 2 | |
291 | |
292 changeset: 0:19709c5a4e75 | |
293 user: test | |
294 date: Thu Jan 01 00:00:00 1970 +0000 | |
295 summary: Adding root node | |
296 | |
297 | |
298 branch default | |
299 | |
300 $ hg heads default | |
301 changeset: 0:19709c5a4e75 | |
302 user: test | |
303 date: Thu Jan 01 00:00:00 1970 +0000 | |
304 summary: Adding root node | |
305 | |
306 | |
307 branch a | |
308 | |
309 $ hg heads a | |
310 changeset: 5:d8cbc61dbaa6 | |
311 branch: a | |
312 parent: 2:881fe2b92ad0 | |
313 user: test | |
314 date: Thu Jan 01 00:00:04 1970 +0000 | |
315 summary: Adding b branch head 2 | |
316 | |
317 $ hg heads --active a | |
318 no open branch heads found on branches a | |
319 | |
320 branch b | |
321 | |
322 $ hg heads b | |
323 changeset: 13:6ac12926b8c3 | |
324 branch: b | |
325 tag: tip | |
326 user: test | |
327 date: Thu Jan 01 00:00:09 1970 +0000 | |
328 summary: reopen branch with a change | |
329 | |
330 $ hg heads --closed b | |
331 changeset: 13:6ac12926b8c3 | |
332 branch: b | |
333 tag: tip | |
334 user: test | |
335 date: Thu Jan 01 00:00:09 1970 +0000 | |
336 summary: reopen branch with a change | |
337 | |
338 changeset: 11:c84627f3c15d | |
339 branch: b | |
340 user: test | |
341 date: Thu Jan 01 00:00:09 1970 +0000 | |
342 summary: prune bad branch | |
343 |