##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

Simplify the output of test-bheads...
Alexis S. L. Carvalho -
r6127:25c372e8 default
parent child Browse files
Show More
Show file before | Show file after | Hide comments
@@ -1,108 +1,113 b''
1 #!/bin/sh
1 #!/bin/sh
2
2
3 heads()
4 {
5 hg heads --template '#rev#: #desc|firstline|strip#\n' "$@"
6 }
7
3 hg init a
8 hg init a
4 cd a
9 cd a
5 echo 'root' >root
10 echo 'root' >root
6 hg add root
11 hg add root
7 hg commit -d '0 0' -u test -m "Adding root node"
12 hg commit -m "Adding root node"
8 hg heads
13 heads
9 echo '-------'
14 echo '-------'
10 hg heads .
15 heads .
11
16
12 echo '======='
17 echo '======='
13 echo 'a' >a
18 echo 'a' >a
14 hg add a
19 hg add a
15 hg branch a
20 hg branch a
16 hg commit -d '1 0' -u test -m "Adding a branch"
21 hg commit -m "Adding a branch"
17 hg heads
22 heads
18 echo '-------'
23 echo '-------'
19 hg heads .
24 heads .
20
25
21 echo '======='
26 echo '======='
22 hg update -C 0
27 hg update -C 0
23 echo 'b' >b
28 echo 'b' >b
24 hg add b
29 hg add b
25 hg branch b
30 hg branch b
26 hg commit -d '2 0' -u test -m "Adding b branch"
31 hg commit -m "Adding b branch"
27 hg heads
32 heads
28 echo '-------'
33 echo '-------'
29 hg heads .
34 heads .
30
35
31 echo '======='
36 echo '======='
32 echo 'bh1' >bh1
37 echo 'bh1' >bh1
33 hg add bh1
38 hg add bh1
34 hg commit -d '3 0' -u test -m "Adding b branch head 1"
39 hg commit -m "Adding b branch head 1"
35 hg heads
40 heads
36 echo '-------'
41 echo '-------'
37 hg heads .
42 heads .
38
43
39 echo '======='
44 echo '======='
40 hg update -C 2
45 hg update -C 2
41 echo 'bh2' >bh2
46 echo 'bh2' >bh2
42 hg add bh2
47 hg add bh2
43 hg commit -d '4 0' -u test -m "Adding b branch head 2"
48 hg commit -m "Adding b branch head 2"
44 hg heads
49 heads
45 echo '-------'
50 echo '-------'
46 hg heads .
51 heads .
47
52
48 echo '======='
53 echo '======='
49 hg update -C 2
54 hg update -C 2
50 echo 'bh3' >bh3
55 echo 'bh3' >bh3
51 hg add bh3
56 hg add bh3
52 hg commit -d '5 0' -u test -m "Adding b branch head 3"
57 hg commit -m "Adding b branch head 3"
53 hg heads
58 heads
54 echo '-------'
59 echo '-------'
55 hg heads .
60 heads .
56
61
57 echo '======='
62 echo '======='
58 hg merge 4
63 hg merge 4
59 hg commit -d '6 0' -u test -m "Merging b branch head 2 and b branch head 3"
64 hg commit -m "Merging b branch head 2 and b branch head 3"
60 hg heads
65 heads
61 echo '-------'
66 echo '-------'
62 hg heads .
67 heads .
63
68
64 echo '======='
69 echo '======='
65 echo 'c' >c
70 echo 'c' >c
66 hg add c
71 hg add c
67 hg branch c
72 hg branch c
68 hg commit -d '7 0' -u test -m "Adding c branch"
73 hg commit -m "Adding c branch"
69 hg heads
74 heads
70 echo '-------'
75 echo '-------'
71 hg heads .
76 heads .
72
77
73 echo '======='
78 echo '======='
74 hg heads -r 3 .
79 heads -r 3 .
75 echo $?
80 echo $?
76 echo '-------'
81 echo '-------'
77 hg heads -r 2 .
82 heads -r 2 .
78 echo $?
83 echo $?
79 echo '-------'
84 echo '-------'
80 hg update -C 4
85 hg update -C 4
81 echo $?
86 echo $?
82 echo '-------'
87 echo '-------'
83 hg heads -r 3 .
88 heads -r 3 .
84 echo $?
89 echo $?
85 echo '-------'
90 echo '-------'
86 hg heads -r 2 .
91 heads -r 2 .
87 echo $?
92 echo $?
88 echo '-------'
93 echo '-------'
89 hg heads -r 7 .
94 heads -r 7 .
90 echo $?
95 echo $?
91
96
92 echo '======='
97 echo '======='
93 for i in 0 1 2 3 4 5 6 7; do
98 for i in 0 1 2 3 4 5 6 7; do
94 hg update -C "$i"
99 hg update -C "$i"
95 hg heads
100 heads
96 echo '-------'
101 echo '-------'
97 hg heads .
102 heads .
98 echo '-------'
103 echo '-------'
99 done
104 done
100
105
101 echo '======='
106 echo '======='
102 for i in a b c z; do
107 for i in a b c z; do
103 hg heads "$i"
108 heads "$i"
104 echo '-------'
109 echo '-------'
105 done
110 done
106
111
107 echo '======='
112 echo '======='
108 hg heads 0 1 2 3 4 5 6 7
113 heads 0 1 2 3 4 5 6 7
Show file before | Show file after | Hide comments
This diff has been collapsed as it changes many lines, (619 lines changed) Show them Hide them
@@ -1,608 +1,151 b''
1 changeset: 0:19709c5a4e75
1 0: Adding root node
2 tag: tip
3 user: test
4 date: Thu Jan 01 00:00:00 1970 +0000
5 summary: Adding root node
6
7 -------
2 -------
8 changeset: 0:19709c5a4e75
3 0: Adding root node
9 tag: tip
10 user: test
11 date: Thu Jan 01 00:00:00 1970 +0000
12 summary: Adding root node
13
14 =======
4 =======
15 marked working directory as branch a
5 marked working directory as branch a
16 changeset: 1:dd6b440dd85a
6 1: Adding a branch
17 branch: a
18 tag: tip
19 user: test
20 date: Thu Jan 01 00:00:01 1970 +0000
21 summary: Adding a branch
22
23 -------
7 -------
24 changeset: 1:dd6b440dd85a
8 1: Adding a branch
25 branch: a
26 tag: tip
27 user: test
28 date: Thu Jan 01 00:00:01 1970 +0000
29 summary: Adding a branch
30
31 =======
9 =======
32 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
10 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
33 marked working directory as branch b
11 marked working directory as branch b
34 changeset: 2:ac22033332d1
12 2: Adding b branch
35 branch: b
13 1: Adding a branch
36 tag: tip
37 parent: 0:19709c5a4e75
38 user: test
39 date: Thu Jan 01 00:00:02 1970 +0000
40 summary: Adding b branch
41
42 changeset: 1:dd6b440dd85a
43 branch: a
44 user: test
45 date: Thu Jan 01 00:00:01 1970 +0000
46 summary: Adding a branch
47
48 -------
14 -------
49 changeset: 2:ac22033332d1
15 2: Adding b branch
50 branch: b
51 tag: tip
52 parent: 0:19709c5a4e75
53 user: test
54 date: Thu Jan 01 00:00:02 1970 +0000
55 summary: Adding b branch
56
57 =======
16 =======
58 changeset: 3:aee39cd168d0
17 3: Adding b branch head 1
59 branch: b
18 1: Adding a branch
60 tag: tip
61 user: test
62 date: Thu Jan 01 00:00:03 1970 +0000
63 summary: Adding b branch head 1
64
65 changeset: 1:dd6b440dd85a
66 branch: a
67 user: test
68 date: Thu Jan 01 00:00:01 1970 +0000
69 summary: Adding a branch
70
71 -------
19 -------
72 changeset: 3:aee39cd168d0
20 3: Adding b branch head 1
73 branch: b
74 tag: tip
75 user: test
76 date: Thu Jan 01 00:00:03 1970 +0000
77 summary: Adding b branch head 1
78
79 =======
21 =======
80 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
22 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
81 changeset: 4:22df7444f7c1
23 4: Adding b branch head 2
82 branch: b
24 3: Adding b branch head 1
83 tag: tip
25 1: Adding a branch
84 parent: 2:ac22033332d1
85 user: test
86 date: Thu Jan 01 00:00:04 1970 +0000
87 summary: Adding b branch head 2
88
89 changeset: 3:aee39cd168d0
90 branch: b
91 user: test
92 date: Thu Jan 01 00:00:03 1970 +0000
93 summary: Adding b branch head 1
94
95 changeset: 1:dd6b440dd85a
96 branch: a
97 user: test
98 date: Thu Jan 01 00:00:01 1970 +0000
99 summary: Adding a branch
100
101 -------
26 -------
102 changeset: 4:22df7444f7c1
27 4: Adding b branch head 2
103 branch: b
28 3: Adding b branch head 1
104 tag: tip
105 parent: 2:ac22033332d1
106 user: test
107 date: Thu Jan 01 00:00:04 1970 +0000
108 summary: Adding b branch head 2
109
110 changeset: 3:aee39cd168d0
111 branch: b
112 user: test
113 date: Thu Jan 01 00:00:03 1970 +0000
114 summary: Adding b branch head 1
115
116 =======
29 =======
117 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
30 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
118 changeset: 5:0d57af4f9583
31 5: Adding b branch head 3
119 branch: b
32 4: Adding b branch head 2
120 tag: tip
33 3: Adding b branch head 1
121 parent: 2:ac22033332d1
34 1: Adding a branch
122 user: test
123 date: Thu Jan 01 00:00:05 1970 +0000
124 summary: Adding b branch head 3
125
126 changeset: 4:22df7444f7c1
127 branch: b
128 parent: 2:ac22033332d1
129 user: test
130 date: Thu Jan 01 00:00:04 1970 +0000
131 summary: Adding b branch head 2
132
133 changeset: 3:aee39cd168d0
134 branch: b
135 user: test
136 date: Thu Jan 01 00:00:03 1970 +0000
137 summary: Adding b branch head 1
138
139 changeset: 1:dd6b440dd85a
140 branch: a
141 user: test
142 date: Thu Jan 01 00:00:01 1970 +0000
143 summary: Adding a branch
144
145 -------
35 -------
146 changeset: 5:0d57af4f9583
36 5: Adding b branch head 3
147 branch: b
37 4: Adding b branch head 2
148 tag: tip
38 3: Adding b branch head 1
149 parent: 2:ac22033332d1
150 user: test
151 date: Thu Jan 01 00:00:05 1970 +0000
152 summary: Adding b branch head 3
153
154 changeset: 4:22df7444f7c1
155 branch: b
156 parent: 2:ac22033332d1
157 user: test
158 date: Thu Jan 01 00:00:04 1970 +0000
159 summary: Adding b branch head 2
160
161 changeset: 3:aee39cd168d0
162 branch: b
163 user: test
164 date: Thu Jan 01 00:00:03 1970 +0000
165 summary: Adding b branch head 1
166
167 =======
39 =======
168 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
40 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
169 (branch merge, don't forget to commit)
41 (branch merge, don't forget to commit)
170 changeset: 6:00432327d822
42 6: Merging b branch head 2 and b branch head 3
171 branch: b
43 3: Adding b branch head 1
172 tag: tip
44 1: Adding a branch
173 parent: 5:0d57af4f9583
174 parent: 4:22df7444f7c1
175 user: test
176 date: Thu Jan 01 00:00:06 1970 +0000
177 summary: Merging b branch head 2 and b branch head 3
178
179 changeset: 3:aee39cd168d0
180 branch: b
181 user: test
182 date: Thu Jan 01 00:00:03 1970 +0000
183 summary: Adding b branch head 1
184
185 changeset: 1:dd6b440dd85a
186 branch: a
187 user: test
188 date: Thu Jan 01 00:00:01 1970 +0000
189 summary: Adding a branch
190
191 -------
45 -------
192 changeset: 6:00432327d822
46 6: Merging b branch head 2 and b branch head 3
193 branch: b
47 3: Adding b branch head 1
194 tag: tip
195 parent: 5:0d57af4f9583
196 parent: 4:22df7444f7c1
197 user: test
198 date: Thu Jan 01 00:00:06 1970 +0000
199 summary: Merging b branch head 2 and b branch head 3
200
201 changeset: 3:aee39cd168d0
202 branch: b
203 user: test
204 date: Thu Jan 01 00:00:03 1970 +0000
205 summary: Adding b branch head 1
206
207 =======
48 =======
208 marked working directory as branch c
49 marked working directory as branch c
209 changeset: 7:9fb091bb9835
50 7: Adding c branch
210 branch: c
51 3: Adding b branch head 1
211 tag: tip
52 1: Adding a branch
212 user: test
213 date: Thu Jan 01 00:00:07 1970 +0000
214 summary: Adding c branch
215
216 changeset: 3:aee39cd168d0
217 branch: b
218 user: test
219 date: Thu Jan 01 00:00:03 1970 +0000
220 summary: Adding b branch head 1
221
222 changeset: 1:dd6b440dd85a
223 branch: a
224 user: test
225 date: Thu Jan 01 00:00:01 1970 +0000
226 summary: Adding a branch
227
228 -------
53 -------
229 changeset: 7:9fb091bb9835
54 7: Adding c branch
230 branch: c
231 tag: tip
232 user: test
233 date: Thu Jan 01 00:00:07 1970 +0000
234 summary: Adding c branch
235
236 =======
55 =======
237 no changes on branch c containing . are reachable from 3
56 no changes on branch c containing . are reachable from 3
238 1
57 1
239 -------
58 -------
240 changeset: 7:9fb091bb9835
59 7: Adding c branch
241 branch: c
242 tag: tip
243 user: test
244 date: Thu Jan 01 00:00:07 1970 +0000
245 summary: Adding c branch
246
247 0
60 0
248 -------
61 -------
249 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
62 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
250 0
63 0
251 -------
64 -------
252 changeset: 3:aee39cd168d0
65 3: Adding b branch head 1
253 branch: b
254 user: test
255 date: Thu Jan 01 00:00:03 1970 +0000
256 summary: Adding b branch head 1
257
258 0
66 0
259 -------
67 -------
260 changeset: 3:aee39cd168d0
68 3: Adding b branch head 1
261 branch: b
69 6: Merging b branch head 2 and b branch head 3
262 user: test
263 date: Thu Jan 01 00:00:03 1970 +0000
264 summary: Adding b branch head 1
265
266 changeset: 6:00432327d822
267 branch: b
268 parent: 5:0d57af4f9583
269 parent: 4:22df7444f7c1
270 user: test
271 date: Thu Jan 01 00:00:06 1970 +0000
272 summary: Merging b branch head 2 and b branch head 3
273
274 0
70 0
275 -------
71 -------
276 no changes on branch b containing . are reachable from 7
72 no changes on branch b containing . are reachable from 7
277 1
73 1
278 =======
74 =======
279 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
75 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
280 changeset: 7:9fb091bb9835
76 7: Adding c branch
281 branch: c
77 3: Adding b branch head 1
282 tag: tip
78 1: Adding a branch
283 user: test
284 date: Thu Jan 01 00:00:07 1970 +0000
285 summary: Adding c branch
286
287 changeset: 3:aee39cd168d0
288 branch: b
289 user: test
290 date: Thu Jan 01 00:00:03 1970 +0000
291 summary: Adding b branch head 1
292
293 changeset: 1:dd6b440dd85a
294 branch: a
295 user: test
296 date: Thu Jan 01 00:00:01 1970 +0000
297 summary: Adding a branch
298
299 -------
79 -------
300 changeset: 0:19709c5a4e75
80 0: Adding root node
301 user: test
302 date: Thu Jan 01 00:00:00 1970 +0000
303 summary: Adding root node
304
305 -------
81 -------
306 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
82 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
307 changeset: 7:9fb091bb9835
83 7: Adding c branch
308 branch: c
84 3: Adding b branch head 1
309 tag: tip
85 1: Adding a branch
310 user: test
311 date: Thu Jan 01 00:00:07 1970 +0000
312 summary: Adding c branch
313
314 changeset: 3:aee39cd168d0
315 branch: b
316 user: test
317 date: Thu Jan 01 00:00:03 1970 +0000
318 summary: Adding b branch head 1
319
320 changeset: 1:dd6b440dd85a
321 branch: a
322 user: test
323 date: Thu Jan 01 00:00:01 1970 +0000
324 summary: Adding a branch
325
326 -------
86 -------
327 changeset: 1:dd6b440dd85a
87 1: Adding a branch
328 branch: a
329 user: test
330 date: Thu Jan 01 00:00:01 1970 +0000
331 summary: Adding a branch
332
333 -------
88 -------
334 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
89 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
335 changeset: 7:9fb091bb9835
90 7: Adding c branch
336 branch: c
91 3: Adding b branch head 1
337 tag: tip
92 1: Adding a branch
338 user: test
339 date: Thu Jan 01 00:00:07 1970 +0000
340 summary: Adding c branch
341
342 changeset: 3:aee39cd168d0
343 branch: b
344 user: test
345 date: Thu Jan 01 00:00:03 1970 +0000
346 summary: Adding b branch head 1
347
348 changeset: 1:dd6b440dd85a
349 branch: a
350 user: test
351 date: Thu Jan 01 00:00:01 1970 +0000
352 summary: Adding a branch
353
354 -------
93 -------
355 changeset: 6:00432327d822
94 6: Merging b branch head 2 and b branch head 3
356 branch: b
95 3: Adding b branch head 1
357 parent: 5:0d57af4f9583
358 parent: 4:22df7444f7c1
359 user: test
360 date: Thu Jan 01 00:00:06 1970 +0000
361 summary: Merging b branch head 2 and b branch head 3
362
363 changeset: 3:aee39cd168d0
364 branch: b
365 user: test
366 date: Thu Jan 01 00:00:03 1970 +0000
367 summary: Adding b branch head 1
368
369 -------
96 -------
370 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
97 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
371 changeset: 7:9fb091bb9835
98 7: Adding c branch
372 branch: c
99 3: Adding b branch head 1
373 tag: tip
100 1: Adding a branch
374 user: test
375 date: Thu Jan 01 00:00:07 1970 +0000
376 summary: Adding c branch
377
378 changeset: 3:aee39cd168d0
379 branch: b
380 user: test
381 date: Thu Jan 01 00:00:03 1970 +0000
382 summary: Adding b branch head 1
383
384 changeset: 1:dd6b440dd85a
385 branch: a
386 user: test
387 date: Thu Jan 01 00:00:01 1970 +0000
388 summary: Adding a branch
389
390 -------
101 -------
391 changeset: 6:00432327d822
102 6: Merging b branch head 2 and b branch head 3
392 branch: b
103 3: Adding b branch head 1
393 parent: 5:0d57af4f9583
394 parent: 4:22df7444f7c1
395 user: test
396 date: Thu Jan 01 00:00:06 1970 +0000
397 summary: Merging b branch head 2 and b branch head 3
398
399 changeset: 3:aee39cd168d0
400 branch: b
401 user: test
402 date: Thu Jan 01 00:00:03 1970 +0000
403 summary: Adding b branch head 1
404
405 -------
104 -------
406 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
105 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
407 changeset: 7:9fb091bb9835
106 7: Adding c branch
408 branch: c
107 3: Adding b branch head 1
409 tag: tip
108 1: Adding a branch
410 user: test
411 date: Thu Jan 01 00:00:07 1970 +0000
412 summary: Adding c branch
413
414 changeset: 3:aee39cd168d0
415 branch: b
416 user: test
417 date: Thu Jan 01 00:00:03 1970 +0000
418 summary: Adding b branch head 1
419
420 changeset: 1:dd6b440dd85a
421 branch: a
422 user: test
423 date: Thu Jan 01 00:00:01 1970 +0000
424 summary: Adding a branch
425
426 -------
109 -------
427 changeset: 6:00432327d822
110 6: Merging b branch head 2 and b branch head 3
428 branch: b
111 3: Adding b branch head 1
429 parent: 5:0d57af4f9583
430 parent: 4:22df7444f7c1
431 user: test
432 date: Thu Jan 01 00:00:06 1970 +0000
433 summary: Merging b branch head 2 and b branch head 3
434
435 changeset: 3:aee39cd168d0
436 branch: b
437 user: test
438 date: Thu Jan 01 00:00:03 1970 +0000
439 summary: Adding b branch head 1
440
441 -------
112 -------
442 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
113 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
443 changeset: 7:9fb091bb9835
114 7: Adding c branch
444 branch: c
115 3: Adding b branch head 1
445 tag: tip
116 1: Adding a branch
446 user: test
447 date: Thu Jan 01 00:00:07 1970 +0000
448 summary: Adding c branch
449
450 changeset: 3:aee39cd168d0
451 branch: b
452 user: test
453 date: Thu Jan 01 00:00:03 1970 +0000
454 summary: Adding b branch head 1
455
456 changeset: 1:dd6b440dd85a
457 branch: a
458 user: test
459 date: Thu Jan 01 00:00:01 1970 +0000
460 summary: Adding a branch
461
462 -------
117 -------
463 changeset: 6:00432327d822
118 6: Merging b branch head 2 and b branch head 3
464 branch: b
119 3: Adding b branch head 1
465 parent: 5:0d57af4f9583
466 parent: 4:22df7444f7c1
467 user: test
468 date: Thu Jan 01 00:00:06 1970 +0000
469 summary: Merging b branch head 2 and b branch head 3
470
471 changeset: 3:aee39cd168d0
472 branch: b
473 user: test
474 date: Thu Jan 01 00:00:03 1970 +0000
475 summary: Adding b branch head 1
476
477 -------
120 -------
478 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
121 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
479 changeset: 7:9fb091bb9835
122 7: Adding c branch
480 branch: c
123 3: Adding b branch head 1
481 tag: tip
124 1: Adding a branch
482 user: test
483 date: Thu Jan 01 00:00:07 1970 +0000
484 summary: Adding c branch
485
486 changeset: 3:aee39cd168d0
487 branch: b
488 user: test
489 date: Thu Jan 01 00:00:03 1970 +0000
490 summary: Adding b branch head 1
491
492 changeset: 1:dd6b440dd85a
493 branch: a
494 user: test
495 date: Thu Jan 01 00:00:01 1970 +0000
496 summary: Adding a branch
497
498 -------
125 -------
499 changeset: 6:00432327d822
126 6: Merging b branch head 2 and b branch head 3
500 branch: b
127 3: Adding b branch head 1
501 parent: 5:0d57af4f9583
502 parent: 4:22df7444f7c1
503 user: test
504 date: Thu Jan 01 00:00:06 1970 +0000
505 summary: Merging b branch head 2 and b branch head 3
506
507 changeset: 3:aee39cd168d0
508 branch: b
509 user: test
510 date: Thu Jan 01 00:00:03 1970 +0000
511 summary: Adding b branch head 1
512
513 -------
128 -------
514 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
129 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
515 changeset: 7:9fb091bb9835
130 7: Adding c branch
516 branch: c
131 3: Adding b branch head 1
517 tag: tip
132 1: Adding a branch
518 user: test
519 date: Thu Jan 01 00:00:07 1970 +0000
520 summary: Adding c branch
521
522 changeset: 3:aee39cd168d0
523 branch: b
524 user: test
525 date: Thu Jan 01 00:00:03 1970 +0000
526 summary: Adding b branch head 1
527
528 changeset: 1:dd6b440dd85a
529 branch: a
530 user: test
531 date: Thu Jan 01 00:00:01 1970 +0000
532 summary: Adding a branch
533
534 -------
133 -------
535 changeset: 7:9fb091bb9835
134 7: Adding c branch
536 branch: c
537 tag: tip
538 user: test
539 date: Thu Jan 01 00:00:07 1970 +0000
540 summary: Adding c branch
541
542 -------
135 -------
543 =======
136 =======
544 changeset: 1:dd6b440dd85a
137 1: Adding a branch
545 branch: a
546 user: test
547 date: Thu Jan 01 00:00:01 1970 +0000
548 summary: Adding a branch
549
550 -------
138 -------
551 changeset: 6:00432327d822
139 6: Merging b branch head 2 and b branch head 3
552 branch: b
140 3: Adding b branch head 1
553 parent: 5:0d57af4f9583
554 parent: 4:22df7444f7c1
555 user: test
556 date: Thu Jan 01 00:00:06 1970 +0000
557 summary: Merging b branch head 2 and b branch head 3
558
559 changeset: 3:aee39cd168d0
560 branch: b
561 user: test
562 date: Thu Jan 01 00:00:03 1970 +0000
563 summary: Adding b branch head 1
564
565 -------
141 -------
566 changeset: 7:9fb091bb9835
142 7: Adding c branch
567 branch: c
568 tag: tip
569 user: test
570 date: Thu Jan 01 00:00:07 1970 +0000
571 summary: Adding c branch
572
573 -------
143 -------
574 abort: unknown revision 'z'!
144 abort: unknown revision 'z'!
575 -------
145 -------
576 =======
146 =======
577 changeset: 0:19709c5a4e75
147 0: Adding root node
578 user: test
148 1: Adding a branch
579 date: Thu Jan 01 00:00:00 1970 +0000
149 6: Merging b branch head 2 and b branch head 3
580 summary: Adding root node
150 3: Adding b branch head 1
581
151 7: Adding c branch
582 changeset: 1:dd6b440dd85a
583 branch: a
584 user: test
585 date: Thu Jan 01 00:00:01 1970 +0000
586 summary: Adding a branch
587
588 changeset: 6:00432327d822
589 branch: b
590 parent: 5:0d57af4f9583
591 parent: 4:22df7444f7c1
592 user: test
593 date: Thu Jan 01 00:00:06 1970 +0000
594 summary: Merging b branch head 2 and b branch head 3
595
596 changeset: 3:aee39cd168d0
597 branch: b
598 user: test
599 date: Thu Jan 01 00:00:03 1970 +0000
600 summary: Adding b branch head 1
601
602 changeset: 7:9fb091bb9835
603 branch: c
604 tag: tip
605 user: test
606 date: Thu Jan 01 00:00:07 1970 +0000
607 summary: Adding c branch
608
General Comments 0
You need to be logged in to leave comments. Login now