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