68 $ hg fold --exact -r 5 -r 6 --date "0 0" -m "fold2" -n "folding changesets to test" |
68 $ hg fold --exact -r 5 -r 6 --date "0 0" -m "fold2" -n "folding changesets to test" |
69 2 changesets folded |
69 2 changesets folded |
70 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
70 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
71 $ hg obslog -r . |
71 $ hg obslog -r . |
72 @ 100cc25b765f (9) fold2 |
72 @ 100cc25b765f (9) fold2 |
73 |\ |
73 |\ folded(description, parent, content) from 0da815c333f6, d9f908fde1a1 using fold by test (Thu Jan 01 00:00:00 1970 +0000) |
|
74 | | note: folding changesets to test |
|
75 | | |
74 x | 0da815c333f6 (5) E |
76 x | 0da815c333f6 (5) E |
75 / folded(description, content) as 100cc25b765f using fold by test (Thu Jan 01 00:00:00 1970 +0000) |
77 / |
76 | note: folding changesets to test |
|
77 | |
|
78 x d9f908fde1a1 (6) F |
78 x d9f908fde1a1 (6) F |
79 folded(description, parent, content) as 100cc25b765f using fold by test (Thu Jan 01 00:00:00 1970 +0000) |
|
80 note: folding changesets to test |
|
81 |
79 |
82 $ hg log -G |
80 $ hg log -G |
83 @ changeset: 9:100cc25b765f |
81 @ changeset: 9:100cc25b765f |
84 | tag: tip |
82 | tag: tip |
85 | parent: 4:868d2e0eb19c |
83 | parent: 4:868d2e0eb19c |
392 Obslog should show a subset of the obs history, this test checks that the |
390 Obslog should show a subset of the obs history, this test checks that the |
393 walking algorithm works no matter the level of successors + precursors |
391 walking algorithm works no matter the level of successors + precursors |
394 |
392 |
395 $ hg obslog 12 |
393 $ hg obslog 12 |
396 * 7b3290f6e0a0 (12) fold1 |
394 * 7b3290f6e0a0 (12) fold1 |
|
395 |\ split(parent, content) from d15d0ffc75f6 using split by test (Thu Jan 01 00:00:00 1970 +0000) |
|
396 | | rewritten(description, parent, content) from e036916b63ea using prune by test (Thu Jan 01 00:00:00 1970 +0000) |
|
397 | | |
|
398 x | d15d0ffc75f6 (8) fold1 |
|
399 |\ \ folded(description, parent, content) from 868d2e0eb19c, a8df460dbbfe using fold by test (Thu Jan 01 00:00:00 1970 +0000) |
|
400 | | | |
|
401 | | x e036916b63ea (11) fold0 |
|
402 | | | split(parent, content) from b868bc49b0a4 using split by test (Thu Jan 01 00:00:00 1970 +0000) |
|
403 | | | |
|
404 x | | 868d2e0eb19c (4) D |
|
405 / / |
|
406 x / a8df460dbbfe (3) C |
|
407 / |
|
408 x b868bc49b0a4 (7) fold0 |
|
409 |\ folded(description, parent, content) from 2a34000d3544, c473644ee0e9 using fold by test (Thu Jan 01 00:00:00 1970 +0000) |
|
410 | | |
|
411 x | 2a34000d3544 (1) A |
|
412 / |
|
413 x c473644ee0e9 (2) B |
|
414 |
|
415 |
|
416 $ hg obslog 12 --no-origin |
|
417 * 7b3290f6e0a0 (12) fold1 |
397 |\ |
418 |\ |
398 x | d15d0ffc75f6 (8) fold1 |
419 x | d15d0ffc75f6 (8) fold1 |
399 |\ \ split(parent, content) as 7b3290f6e0a0, d0f33db50670 using split by test (Thu Jan 01 00:00:00 1970 +0000) |
420 |\ \ split(parent, content) as 7b3290f6e0a0, d0f33db50670 using split by test (Thu Jan 01 00:00:00 1970 +0000) |
400 | | | |
421 | | | |
401 | | x e036916b63ea (11) fold0 |
422 | | x e036916b63ea (11) fold0 |
418 |
439 |
419 While with all option, we should see 15 changesets |
440 While with all option, we should see 15 changesets |
420 |
441 |
421 $ hg obslog --all 15 |
442 $ hg obslog --all 15 |
422 o 19e14c8397fc (10) fold0 |
443 o 19e14c8397fc (10) fold0 |
|
444 | split(parent, content) from b868bc49b0a4 using split by test (Thu Jan 01 00:00:00 1970 +0000) |
423 | |
445 | |
424 | * 7b3290f6e0a0 (12) fold1 |
446 | * 7b3290f6e0a0 (12) fold1 |
425 | |\ |
447 | |\ split(parent, content) from d15d0ffc75f6 using split by test (Thu Jan 01 00:00:00 1970 +0000) |
|
448 | | | rewritten(description, parent, content) from e036916b63ea using prune by test (Thu Jan 01 00:00:00 1970 +0000) |
|
449 | | | |
426 | | | @ d4a000f63ee9 (15) fold2 |
450 | | | @ d4a000f63ee9 (15) fold2 |
|
451 | | | | split(parent, content) from 100cc25b765f using split by test (Thu Jan 01 00:00:00 1970 +0000) |
427 | | | | |
452 | | | | |
428 | | | | * ec31316faa9d (14) fold2 |
453 | | | | * ec31316faa9d (14) fold2 |
429 | | | |/| |
454 | | | |/| split(parent, content) from 100cc25b765f using split by test (Thu Jan 01 00:00:00 1970 +0000) |
|
455 | | | | | rewritten(description, parent, content) from d0f33db50670 using prune by test (Thu Jan 01 00:00:00 1970 +0000) |
|
456 | | | | | note: this is a note stored in obsmarker in prune |
|
457 | | | | | |
430 | | | x | 100cc25b765f (9) fold2 |
458 | | | x | 100cc25b765f (9) fold2 |
431 | | | |\ \ split(parent, content) as d4a000f63ee9, ec31316faa9d using split by test (Thu Jan 01 00:00:00 1970 +0000) |
459 | | | |\ \ folded(description, parent, content) from 0da815c333f6, d9f908fde1a1 using fold by test (Thu Jan 01 00:00:00 1970 +0000) |
|
460 | | | | | | note: folding changesets to test |
432 | | | | | | |
461 | | | | | | |
433 | +-------x d0f33db50670 (13) fold1 |
462 | +-------x d0f33db50670 (13) fold1 |
434 | | | | | rewritten(description, parent, content) as ec31316faa9d using prune by test (Thu Jan 01 00:00:00 1970 +0000) |
463 | | | | | split(parent, content) from d15d0ffc75f6 using split by test (Thu Jan 01 00:00:00 1970 +0000) |
435 | | | | | note: this is a note stored in obsmarker in prune |
|
436 | | | | | |
464 | | | | | |
437 +---x | | e036916b63ea (11) fold0 |
465 +---x | | e036916b63ea (11) fold0 |
438 | | / / rewritten(description, parent, content) as 7b3290f6e0a0 using prune by test (Thu Jan 01 00:00:00 1970 +0000) |
466 | | / / split(parent, content) from b868bc49b0a4 using split by test (Thu Jan 01 00:00:00 1970 +0000) |
439 | | | | |
467 | | | | |
440 | | x | 0da815c333f6 (5) E |
468 | | x / 0da815c333f6 (5) E |
441 | | / folded(description, content) as 100cc25b765f using fold by test (Thu Jan 01 00:00:00 1970 +0000) |
469 | | / |
442 | | | note: folding changesets to test |
|
443 | | | |
|
444 x | | b868bc49b0a4 (7) fold0 |
470 x | | b868bc49b0a4 (7) fold0 |
445 |\ \ \ split(parent, content) as 19e14c8397fc, e036916b63ea using split by test (Thu Jan 01 00:00:00 1970 +0000) |
471 |\ \ \ folded(description, parent, content) from 2a34000d3544, c473644ee0e9 using fold by test (Thu Jan 01 00:00:00 1970 +0000) |
446 | | | | |
472 | | | | |
447 | | x | d15d0ffc75f6 (8) fold1 |
473 | | x | d15d0ffc75f6 (8) fold1 |
448 | | |\ \ split(parent, content) as 7b3290f6e0a0, d0f33db50670 using split by test (Thu Jan 01 00:00:00 1970 +0000) |
474 | | |\ \ folded(description, parent, content) from 868d2e0eb19c, a8df460dbbfe using fold by test (Thu Jan 01 00:00:00 1970 +0000) |
449 | | | | | |
475 | | | | | |
450 | | | | x d9f908fde1a1 (6) F |
476 | | | | x d9f908fde1a1 (6) F |
451 | | | | folded(description, parent, content) as 100cc25b765f using fold by test (Thu Jan 01 00:00:00 1970 +0000) |
|
452 | | | | note: folding changesets to test |
|
453 | | | | |
477 | | | | |
454 x | | | 2a34000d3544 (1) A |
478 x | | | 2a34000d3544 (1) A |
455 / / / folded(description, content) as b868bc49b0a4 using fold by test (Thu Jan 01 00:00:00 1970 +0000) |
479 / / / |
456 | | | |
480 | x / 868d2e0eb19c (4) D |
457 | x | 868d2e0eb19c (4) D |
481 | / |
458 | / folded(description, parent, content) as d15d0ffc75f6 using fold by test (Thu Jan 01 00:00:00 1970 +0000) |
|
459 | | |
|
460 | x a8df460dbbfe (3) C |
482 | x a8df460dbbfe (3) C |
461 | folded(description, content) as d15d0ffc75f6 using fold by test (Thu Jan 01 00:00:00 1970 +0000) |
|
462 | |
483 | |
463 x c473644ee0e9 (2) B |
484 x c473644ee0e9 (2) B |
464 folded(description, parent, content) as b868bc49b0a4 using fold by test (Thu Jan 01 00:00:00 1970 +0000) |
485 |
465 |
|