76 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
76 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
77 $ hg obslog -r . |
77 $ hg obslog -r . |
78 @ 100cc25b765f (9) fold2 |
78 @ 100cc25b765f (9) fold2 |
79 |\ |
79 |\ |
80 x | 0da815c333f6 (5) E |
80 x | 0da815c333f6 (5) E |
81 / rewritten(description, content) as 100cc25b765f by test (Thu Jan 01 00:00:00 1970 +0000) |
81 / rewritten(description, content) as 100cc25b765f using fold by test (Thu Jan 01 00:00:00 1970 +0000) |
82 | note: folding changesets to test |
82 | note: folding changesets to test |
83 | |
83 | |
84 x d9f908fde1a1 (6) F |
84 x d9f908fde1a1 (6) F |
85 rewritten(description, parent, content) as 100cc25b765f by test (Thu Jan 01 00:00:00 1970 +0000) |
85 rewritten(description, parent, content) as 100cc25b765f using fold by test (Thu Jan 01 00:00:00 1970 +0000) |
86 note: folding changesets to test |
86 note: folding changesets to test |
87 |
87 |
88 $ hg log -G |
88 $ hg log -G |
89 @ changeset: 9:100cc25b765f |
89 @ changeset: 9:100cc25b765f |
90 | tag: tip |
90 | tag: tip |
108 | | | summary: fold0 |
108 | | | summary: fold0 |
109 | | | |
109 | | | |
110 x | | changeset: 4:868d2e0eb19c |
110 x | | changeset: 4:868d2e0eb19c |
111 | | | user: test |
111 | | | user: test |
112 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
112 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
113 | | | obsolete: rewritten as 8:d15d0ffc75f6 |
113 | | | obsolete: rewritten using fold as 8:d15d0ffc75f6 |
114 | | | summary: D |
114 | | | summary: D |
115 | | | |
115 | | | |
116 x | | changeset: 3:a8df460dbbfe |
116 x | | changeset: 3:a8df460dbbfe |
117 |/ / user: test |
117 |/ / user: test |
118 | | date: Thu Jan 01 00:00:00 1970 +0000 |
118 | | date: Thu Jan 01 00:00:00 1970 +0000 |
119 | | obsolete: rewritten as 8:d15d0ffc75f6 |
119 | | obsolete: rewritten using fold as 8:d15d0ffc75f6 |
120 | | summary: C |
120 | | summary: C |
121 | | |
121 | | |
122 x | changeset: 2:c473644ee0e9 |
122 x | changeset: 2:c473644ee0e9 |
123 | | user: test |
123 | | user: test |
124 | | date: Thu Jan 01 00:00:00 1970 +0000 |
124 | | date: Thu Jan 01 00:00:00 1970 +0000 |
125 | | obsolete: rewritten as 7:b868bc49b0a4 |
125 | | obsolete: rewritten using fold as 7:b868bc49b0a4 |
126 | | summary: B |
126 | | summary: B |
127 | | |
127 | | |
128 x | changeset: 1:2a34000d3544 |
128 x | changeset: 1:2a34000d3544 |
129 |/ user: test |
129 |/ user: test |
130 | date: Thu Jan 01 00:00:00 1970 +0000 |
130 | date: Thu Jan 01 00:00:00 1970 +0000 |
131 | obsolete: rewritten as 7:b868bc49b0a4 |
131 | obsolete: rewritten using fold as 7:b868bc49b0a4 |
132 | summary: A |
132 | summary: A |
133 | |
133 | |
134 o changeset: 0:ea207398892e |
134 o changeset: 0:ea207398892e |
135 user: test |
135 user: test |
136 date: Thu Jan 01 00:00:00 1970 +0000 |
136 date: Thu Jan 01 00:00:00 1970 +0000 |
284 | | | summary: fold0 |
284 | | | summary: fold0 |
285 | | | |
285 | | | |
286 x | | changeset: 4:868d2e0eb19c |
286 x | | changeset: 4:868d2e0eb19c |
287 | | | user: test |
287 | | | user: test |
288 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
288 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
289 | | | obsolete: split as 12:7b3290f6e0a0, 13:d0f33db50670 |
289 | | | obsolete: split using fold as 12:7b3290f6e0a0, 13:d0f33db50670 |
290 | | | summary: D |
290 | | | summary: D |
291 | | | |
291 | | | |
292 x | | changeset: 3:a8df460dbbfe |
292 x | | changeset: 3:a8df460dbbfe |
293 |/ / user: test |
293 |/ / user: test |
294 | | date: Thu Jan 01 00:00:00 1970 +0000 |
294 | | date: Thu Jan 01 00:00:00 1970 +0000 |
295 | | obsolete: split as 12:7b3290f6e0a0, 13:d0f33db50670 |
295 | | obsolete: split using fold as 12:7b3290f6e0a0, 13:d0f33db50670 |
296 | | summary: C |
296 | | summary: C |
297 | | |
297 | | |
298 x | changeset: 2:c473644ee0e9 |
298 x | changeset: 2:c473644ee0e9 |
299 | | user: test |
299 | | user: test |
300 | | date: Thu Jan 01 00:00:00 1970 +0000 |
300 | | date: Thu Jan 01 00:00:00 1970 +0000 |
301 | | obsolete: split as 10:19e14c8397fc, 11:e036916b63ea |
301 | | obsolete: split using fold as 10:19e14c8397fc, 11:e036916b63ea |
302 | | summary: B |
302 | | summary: B |
303 | | |
303 | | |
304 x | changeset: 1:2a34000d3544 |
304 x | changeset: 1:2a34000d3544 |
305 |/ user: test |
305 |/ user: test |
306 | date: Thu Jan 01 00:00:00 1970 +0000 |
306 | date: Thu Jan 01 00:00:00 1970 +0000 |
307 | obsolete: split as 10:19e14c8397fc, 11:e036916b63ea |
307 | obsolete: split using fold as 10:19e14c8397fc, 11:e036916b63ea |
308 | summary: A |
308 | summary: A |
309 | |
309 | |
310 o changeset: 0:ea207398892e |
310 o changeset: 0:ea207398892e |
311 user: test |
311 user: test |
312 date: Thu Jan 01 00:00:00 1970 +0000 |
312 date: Thu Jan 01 00:00:00 1970 +0000 |
349 | | | summary: fold0 |
349 | | | summary: fold0 |
350 | | | |
350 | | | |
351 x | | changeset: 4:868d2e0eb19c |
351 x | | changeset: 4:868d2e0eb19c |
352 | | | user: test |
352 | | | user: test |
353 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
353 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
354 | | | obsolete: split as 12:7b3290f6e0a0, 14:ec31316faa9d |
354 | | | obsolete: split using fold as 12:7b3290f6e0a0, 14:ec31316faa9d |
355 | | | summary: D |
355 | | | summary: D |
356 | | | |
356 | | | |
357 x | | changeset: 3:a8df460dbbfe |
357 x | | changeset: 3:a8df460dbbfe |
358 |/ / user: test |
358 |/ / user: test |
359 | | date: Thu Jan 01 00:00:00 1970 +0000 |
359 | | date: Thu Jan 01 00:00:00 1970 +0000 |
360 | | obsolete: split as 12:7b3290f6e0a0, 14:ec31316faa9d |
360 | | obsolete: split using fold as 12:7b3290f6e0a0, 14:ec31316faa9d |
361 | | summary: C |
361 | | summary: C |
362 | | |
362 | | |
363 x | changeset: 2:c473644ee0e9 |
363 x | changeset: 2:c473644ee0e9 |
364 | | user: test |
364 | | user: test |
365 | | date: Thu Jan 01 00:00:00 1970 +0000 |
365 | | date: Thu Jan 01 00:00:00 1970 +0000 |
366 | | obsolete: split as 10:19e14c8397fc, 12:7b3290f6e0a0 |
366 | | obsolete: split using fold as 10:19e14c8397fc, 12:7b3290f6e0a0 |
367 | | summary: B |
367 | | summary: B |
368 | | |
368 | | |
369 x | changeset: 1:2a34000d3544 |
369 x | changeset: 1:2a34000d3544 |
370 |/ user: test |
370 |/ user: test |
371 | date: Thu Jan 01 00:00:00 1970 +0000 |
371 | date: Thu Jan 01 00:00:00 1970 +0000 |
372 | obsolete: split as 10:19e14c8397fc, 12:7b3290f6e0a0 |
372 | obsolete: split using fold as 10:19e14c8397fc, 12:7b3290f6e0a0 |
373 | summary: A |
373 | summary: A |
374 | |
374 | |
375 o changeset: 0:ea207398892e |
375 o changeset: 0:ea207398892e |
376 user: test |
376 user: test |
377 date: Thu Jan 01 00:00:00 1970 +0000 |
377 date: Thu Jan 01 00:00:00 1970 +0000 |
391 | | | |
391 | | | |
392 | | x e036916b63ea (11) fold0 |
392 | | x e036916b63ea (11) fold0 |
393 | | | rewritten(description, parent, content) as 7b3290f6e0a0 by test (Thu Jan 01 00:00:00 1970 +0000) |
393 | | | rewritten(description, parent, content) as 7b3290f6e0a0 by test (Thu Jan 01 00:00:00 1970 +0000) |
394 | | | |
394 | | | |
395 x | | 868d2e0eb19c (4) D |
395 x | | 868d2e0eb19c (4) D |
396 / / rewritten(description, parent, content) as d15d0ffc75f6 by test (Thu Jan 01 00:00:00 1970 +0000) |
396 / / rewritten(description, parent, content) as d15d0ffc75f6 using fold by test (Thu Jan 01 00:00:00 1970 +0000) |
397 | | |
397 | | |
398 x | a8df460dbbfe (3) C |
398 x | a8df460dbbfe (3) C |
399 / rewritten(description, content) as d15d0ffc75f6 by test (Thu Jan 01 00:00:00 1970 +0000) |
399 / rewritten(description, content) as d15d0ffc75f6 using fold by test (Thu Jan 01 00:00:00 1970 +0000) |
400 | |
400 | |
401 x b868bc49b0a4 (7) fold0 |
401 x b868bc49b0a4 (7) fold0 |
402 |\ rewritten(parent, content) as 19e14c8397fc, e036916b63ea by test (Thu Jan 01 00:00:00 1970 +0000) |
402 |\ rewritten(parent, content) as 19e14c8397fc, e036916b63ea by test (Thu Jan 01 00:00:00 1970 +0000) |
403 | | |
403 | | |
404 x | 2a34000d3544 (1) A |
404 x | 2a34000d3544 (1) A |
405 / rewritten(description, content) as b868bc49b0a4 by test (Thu Jan 01 00:00:00 1970 +0000) |
405 / rewritten(description, content) as b868bc49b0a4 using fold by test (Thu Jan 01 00:00:00 1970 +0000) |
406 | |
406 | |
407 x c473644ee0e9 (2) B |
407 x c473644ee0e9 (2) B |
408 rewritten(description, parent, content) as b868bc49b0a4 by test (Thu Jan 01 00:00:00 1970 +0000) |
408 rewritten(description, parent, content) as b868bc49b0a4 using fold by test (Thu Jan 01 00:00:00 1970 +0000) |
409 |
409 |
410 While with all option, we should see 15 changesets |
410 While with all option, we should see 15 changesets |
411 |
411 |
412 $ hg obslog --all 15 |
412 $ hg obslog --all 15 |
413 o 19e14c8397fc (10) fold0 |
413 o 19e14c8397fc (10) fold0 |
427 | | | | | |
427 | | | | | |
428 +---x | | e036916b63ea (11) fold0 |
428 +---x | | e036916b63ea (11) fold0 |
429 | | / / rewritten(description, parent, content) as 7b3290f6e0a0 by test (Thu Jan 01 00:00:00 1970 +0000) |
429 | | / / rewritten(description, parent, content) as 7b3290f6e0a0 by test (Thu Jan 01 00:00:00 1970 +0000) |
430 | | | | |
430 | | | | |
431 | | x | 0da815c333f6 (5) E |
431 | | x | 0da815c333f6 (5) E |
432 | | / rewritten(description, content) as 100cc25b765f by test (Thu Jan 01 00:00:00 1970 +0000) |
432 | | / rewritten(description, content) as 100cc25b765f using fold by test (Thu Jan 01 00:00:00 1970 +0000) |
433 | | | note: folding changesets to test |
433 | | | note: folding changesets to test |
434 | | | |
434 | | | |
435 x | | b868bc49b0a4 (7) fold0 |
435 x | | b868bc49b0a4 (7) fold0 |
436 |\ \ \ rewritten(parent, content) as 19e14c8397fc, e036916b63ea by test (Thu Jan 01 00:00:00 1970 +0000) |
436 |\ \ \ rewritten(parent, content) as 19e14c8397fc, e036916b63ea by test (Thu Jan 01 00:00:00 1970 +0000) |
437 | | | | |
437 | | | | |
438 | | x | d15d0ffc75f6 (8) fold1 |
438 | | x | d15d0ffc75f6 (8) fold1 |
439 | | |\ \ rewritten(parent, content) as 7b3290f6e0a0, d0f33db50670 by test (Thu Jan 01 00:00:00 1970 +0000) |
439 | | |\ \ rewritten(parent, content) as 7b3290f6e0a0, d0f33db50670 by test (Thu Jan 01 00:00:00 1970 +0000) |
440 | | | | | |
440 | | | | | |
441 | | | | x d9f908fde1a1 (6) F |
441 | | | | x d9f908fde1a1 (6) F |
442 | | | | rewritten(description, parent, content) as 100cc25b765f by test (Thu Jan 01 00:00:00 1970 +0000) |
442 | | | | rewritten(description, parent, content) as 100cc25b765f using fold by test (Thu Jan 01 00:00:00 1970 +0000) |
443 | | | | note: folding changesets to test |
443 | | | | note: folding changesets to test |
444 | | | | |
444 | | | | |
445 x | | | 2a34000d3544 (1) A |
445 x | | | 2a34000d3544 (1) A |
446 / / / rewritten(description, content) as b868bc49b0a4 by test (Thu Jan 01 00:00:00 1970 +0000) |
446 / / / rewritten(description, content) as b868bc49b0a4 using fold by test (Thu Jan 01 00:00:00 1970 +0000) |
447 | | | |
447 | | | |
448 | x | 868d2e0eb19c (4) D |
448 | x | 868d2e0eb19c (4) D |
449 | / rewritten(description, parent, content) as d15d0ffc75f6 by test (Thu Jan 01 00:00:00 1970 +0000) |
449 | / rewritten(description, parent, content) as d15d0ffc75f6 using fold by test (Thu Jan 01 00:00:00 1970 +0000) |
450 | | |
450 | | |
451 | x a8df460dbbfe (3) C |
451 | x a8df460dbbfe (3) C |
452 | rewritten(description, content) as d15d0ffc75f6 by test (Thu Jan 01 00:00:00 1970 +0000) |
452 | rewritten(description, content) as d15d0ffc75f6 using fold by test (Thu Jan 01 00:00:00 1970 +0000) |
453 | |
453 | |
454 x c473644ee0e9 (2) B |
454 x c473644ee0e9 (2) B |
455 rewritten(description, parent, content) as b868bc49b0a4 by test (Thu Jan 01 00:00:00 1970 +0000) |
455 rewritten(description, parent, content) as b868bc49b0a4 using fold by test (Thu Jan 01 00:00:00 1970 +0000) |
456 |
456 |