Show More
@@ -1,94 +1,343 b'' | |||||
1 | #!/bin/sh |
|
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" | |||
2 |
|
6 | |||
3 | hg init a |
|
7 | $ echo 'a' >a | |
4 | cd a |
|
8 | $ hg add a | |
5 | echo 'root' >root |
|
9 | $ hg branch a | |
6 | hg add root |
|
10 | marked working directory as branch a | |
7 |
hg commit -d ' |
|
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" | |||
8 |
|
19 | |||
9 | echo 'a' >a |
|
20 | $ hg update -C 0 | |
10 | hg add a |
|
21 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
11 | hg branch a |
|
22 | $ echo 'b' >b | |
12 | hg commit -d '1 0' -m "Adding a branch" |
|
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" | |||
13 |
|
31 | |||
14 | hg branch q |
|
32 | $ hg update -C 2 | |
15 | echo 'aa' >a |
|
33 | 1 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
16 | hg branch -C |
|
34 | $ echo 'bh2' >bh2 | |
17 | hg commit -d '2 0' -m "Adding to a branch" |
|
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 | |||
18 |
|
50 | |||
19 | hg update -C 0 |
|
51 | $ echo 'd' >d | |
20 | echo 'b' >b |
|
52 | $ hg add d | |
21 | hg add b |
|
53 | $ hg branch 'a branch name much longer than the default justification used by branches' | |
22 | hg branch b |
|
54 | marked working directory as branch a branch name much longer than the default justification used by branches | |
23 |
hg commit -d ' |
|
55 | $ hg commit -d '6 0' -m "Adding d branch" | |
24 |
|
56 | |||
25 | echo 'bh1' >bh1 |
|
57 | $ hg branches | |
26 | hg add bh1 |
|
58 | a branch name much longer than the default justification used by branches 7:10ff5895aa57 | |
27 | hg commit -d '3 0' -m "Adding b branch head 1" |
|
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 | |||
28 |
|
71 | |||
29 | hg update -C 2 |
|
72 | $ hg log -b a | |
30 | echo 'bh2' >bh2 |
|
73 | changeset: 5:d8cbc61dbaa6 | |
31 | hg add bh2 |
|
74 | branch: a | |
32 | hg commit -d '4 0' -m "Adding b branch head 2" |
|
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 | ||||
33 |
|
92 | |||
34 | echo 'c' >c |
|
93 | ---- Branch b | |
35 | hg add c |
|
|||
36 | hg branch c |
|
|||
37 | hg commit -d '5 0' -m "Adding c branch" |
|
|||
38 |
|
94 | |||
39 | hg branch tip |
|
95 | $ hg log -b b | |
40 | hg branch null |
|
96 | changeset: 4:aee39cd168d0 | |
41 | hg branch . |
|
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 | ||||
42 |
|
109 | |||
43 | echo 'd' >d |
|
110 | ---- going to test branch closing | |
44 | hg add d |
|
|||
45 | hg branch 'a branch name much longer than the default justification used by branches' |
|
|||
46 | hg commit -d '6 0' -m "Adding d branch" |
|
|||
47 |
|
111 | |||
48 | hg branches |
|
112 | $ hg branches | |
49 | echo '-------' |
|
113 | a branch name much longer than the default justification used by branches 7:10ff5895aa57 | |
50 | hg branches -a |
|
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' | |||
51 |
|
220 | |||
52 | echo "--- Branch a" |
|
221 | --- b branch should be inactive | |
53 | hg log -b a |
|
|||
54 |
|
||||
55 | echo "---- Branch b" |
|
|||
56 | hg log -b b |
|
|||
57 |
|
222 | |||
58 | echo "---- going to test branch closing" |
|
223 | $ hg branches | |
59 | hg branches |
|
224 | a branch name much longer than the default justification used by branches 7:10ff5895aa57 | |
60 | hg up -C b |
|
225 | c 6:589736a22561 (inactive) | |
61 | echo 'xxx1' >> b |
|
226 | a 5:d8cbc61dbaa6 (inactive) | |
62 | hg commit -d '7 0' -m 'adding cset to branch b' |
|
227 | default 0:19709c5a4e75 (inactive) | |
63 | hg up -C aee39cd168d0 |
|
228 | $ hg branches -c | |
64 | echo 'xxx2' >> b |
|
229 | a branch name much longer than the default justification used by branches 7:10ff5895aa57 | |
65 | hg commit -d '8 0' -m 'adding head to branch b' |
|
230 | b 12:2da6583810df (closed) | |
66 | echo 'xxx3' >> b |
|
231 | c 6:589736a22561 (inactive) | |
67 | hg commit -d '9 0' -m 'adding another cset to branch b' |
|
232 | a 5:d8cbc61dbaa6 (inactive) | |
68 | hg branches |
|
233 | default 0:19709c5a4e75 (inactive) | |
69 | hg heads --closed |
|
234 | $ hg branches -a | |
70 | hg heads |
|
235 | a branch name much longer than the default justification used by branches 7:10ff5895aa57 | |
71 | hg commit -d '9 0' --close-branch -m 'prune bad branch' |
|
236 | $ hg heads b | |
72 | hg branches -a |
|
237 | no open branch heads found on branches b | |
73 | hg up -C b |
|
238 | $ hg heads --closed b | |
74 | hg commit -d '9 0' --close-branch -m 'close this part branch too' |
|
239 | changeset: 12:2da6583810df | |
75 | echo '--- b branch should be inactive' |
|
240 | branch: b | |
76 | hg branches |
|
241 | tag: tip | |
77 | hg branches -c |
|
242 | parent: 8:eebb944467c9 | |
78 | hg branches -a |
|
243 | user: test | |
79 | hg heads b |
|
244 | date: Thu Jan 01 00:00:09 1970 +0000 | |
80 | hg heads --closed b |
|
245 | summary: close this part branch too | |
81 | echo 'xxx4' >> b |
|
246 | ||
82 | hg commit -d '9 0' -m 'reopen branch with a change' |
|
247 | changeset: 11:c84627f3c15d | |
83 | echo '--- branch b is back in action' |
|
248 | branch: b | |
84 | hg branches -a |
|
249 | user: test | |
85 | echo '---- test heads listings' |
|
250 | date: Thu Jan 01 00:00:09 1970 +0000 | |
86 | hg heads |
|
251 | summary: prune bad branch | |
87 | echo '% branch default' |
|
252 | ||
88 | hg heads default |
|
253 | $ echo 'xxx4' >> b | |
89 | echo '% branch a' |
|
254 | $ hg commit -d '9 0' -m 'reopen branch with a change' | |
90 | hg heads a |
|
255 | reopening closed branch head 12 | |
91 | hg heads --active a |
|
256 | ||
92 | echo '% branch b' |
|
257 | --- branch b is back in action | |
93 | hg heads b |
|
258 | ||
94 | hg heads --closed b |
|
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 |
1 | NO CONTENT: file was removed |
|
NO CONTENT: file was removed |
General Comments 0
You need to be logged in to leave comments.
Login now