diff -r a9f9edb168a1 -r e8660b28bfee tests/test-evolve-obshistory-complex.t --- a/tests/test-evolve-obshistory-complex.t Thu May 07 01:29:24 2020 +0200 +++ b/tests/test-evolve-obshistory-complex.t Thu May 07 01:29:48 2020 +0200 @@ -70,14 +70,12 @@ 0 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg obslog -r . @ 100cc25b765f (9) fold2 - |\ + |\ folded(description, parent, content) from 0da815c333f6, d9f908fde1a1 using fold by test (Thu Jan 01 00:00:00 1970 +0000) + | | note: folding changesets to test + | | x | 0da815c333f6 (5) E - / folded(description, content) as 100cc25b765f using fold by test (Thu Jan 01 00:00:00 1970 +0000) - | note: folding changesets to test - | + / x d9f908fde1a1 (6) F - folded(description, parent, content) as 100cc25b765f using fold by test (Thu Jan 01 00:00:00 1970 +0000) - note: folding changesets to test $ hg log -G @ changeset: 9:100cc25b765f @@ -394,6 +392,29 @@ $ hg obslog 12 * 7b3290f6e0a0 (12) fold1 + |\ split(parent, content) from d15d0ffc75f6 using split by test (Thu Jan 01 00:00:00 1970 +0000) + | | rewritten(description, parent, content) from e036916b63ea using prune by test (Thu Jan 01 00:00:00 1970 +0000) + | | + x | d15d0ffc75f6 (8) fold1 + |\ \ folded(description, parent, content) from 868d2e0eb19c, a8df460dbbfe using fold by test (Thu Jan 01 00:00:00 1970 +0000) + | | | + | | x e036916b63ea (11) fold0 + | | | split(parent, content) from b868bc49b0a4 using split by test (Thu Jan 01 00:00:00 1970 +0000) + | | | + x | | 868d2e0eb19c (4) D + / / + x / a8df460dbbfe (3) C + / + x b868bc49b0a4 (7) fold0 + |\ folded(description, parent, content) from 2a34000d3544, c473644ee0e9 using fold by test (Thu Jan 01 00:00:00 1970 +0000) + | | + x | 2a34000d3544 (1) A + / + x c473644ee0e9 (2) B + + + $ hg obslog 12 --no-origin + * 7b3290f6e0a0 (12) fold1 |\ x | d15d0ffc75f6 (8) fold1 |\ \ split(parent, content) as 7b3290f6e0a0, d0f33db50670 using split by test (Thu Jan 01 00:00:00 1970 +0000) @@ -420,46 +441,45 @@ $ hg obslog --all 15 o 19e14c8397fc (10) fold0 + | split(parent, content) from b868bc49b0a4 using split by test (Thu Jan 01 00:00:00 1970 +0000) | | * 7b3290f6e0a0 (12) fold1 - | |\ + | |\ split(parent, content) from d15d0ffc75f6 using split by test (Thu Jan 01 00:00:00 1970 +0000) + | | | rewritten(description, parent, content) from e036916b63ea using prune by test (Thu Jan 01 00:00:00 1970 +0000) + | | | | | | @ d4a000f63ee9 (15) fold2 + | | | | split(parent, content) from 100cc25b765f using split by test (Thu Jan 01 00:00:00 1970 +0000) | | | | | | | | * ec31316faa9d (14) fold2 - | | | |/| + | | | |/| split(parent, content) from 100cc25b765f using split by test (Thu Jan 01 00:00:00 1970 +0000) + | | | | | rewritten(description, parent, content) from d0f33db50670 using prune by test (Thu Jan 01 00:00:00 1970 +0000) + | | | | | note: this is a note stored in obsmarker in prune + | | | | | | | | x | 100cc25b765f (9) fold2 - | | | |\ \ split(parent, content) as d4a000f63ee9, ec31316faa9d using split by test (Thu Jan 01 00:00:00 1970 +0000) + | | | |\ \ folded(description, parent, content) from 0da815c333f6, d9f908fde1a1 using fold by test (Thu Jan 01 00:00:00 1970 +0000) + | | | | | | note: folding changesets to test | | | | | | | +-------x d0f33db50670 (13) fold1 - | | | | | rewritten(description, parent, content) as ec31316faa9d using prune by test (Thu Jan 01 00:00:00 1970 +0000) - | | | | | note: this is a note stored in obsmarker in prune + | | | | | split(parent, content) from d15d0ffc75f6 using split by test (Thu Jan 01 00:00:00 1970 +0000) | | | | | +---x | | e036916b63ea (11) fold0 - | | / / rewritten(description, parent, content) as 7b3290f6e0a0 using prune by test (Thu Jan 01 00:00:00 1970 +0000) + | | / / split(parent, content) from b868bc49b0a4 using split by test (Thu Jan 01 00:00:00 1970 +0000) | | | | - | | x | 0da815c333f6 (5) E - | | / folded(description, content) as 100cc25b765f using fold by test (Thu Jan 01 00:00:00 1970 +0000) - | | | note: folding changesets to test - | | | + | | x / 0da815c333f6 (5) E + | | / x | | b868bc49b0a4 (7) fold0 - |\ \ \ split(parent, content) as 19e14c8397fc, e036916b63ea using split by test (Thu Jan 01 00:00:00 1970 +0000) + |\ \ \ folded(description, parent, content) from 2a34000d3544, c473644ee0e9 using fold by test (Thu Jan 01 00:00:00 1970 +0000) | | | | | | x | d15d0ffc75f6 (8) fold1 - | | |\ \ split(parent, content) as 7b3290f6e0a0, d0f33db50670 using split by test (Thu Jan 01 00:00:00 1970 +0000) + | | |\ \ folded(description, parent, content) from 868d2e0eb19c, a8df460dbbfe using fold by test (Thu Jan 01 00:00:00 1970 +0000) | | | | | | | | | x d9f908fde1a1 (6) F - | | | | folded(description, parent, content) as 100cc25b765f using fold by test (Thu Jan 01 00:00:00 1970 +0000) - | | | | note: folding changesets to test | | | | x | | | 2a34000d3544 (1) A - / / / folded(description, content) as b868bc49b0a4 using fold by test (Thu Jan 01 00:00:00 1970 +0000) - | | | - | x | 868d2e0eb19c (4) D - | / folded(description, parent, content) as d15d0ffc75f6 using fold by test (Thu Jan 01 00:00:00 1970 +0000) - | | + / / / + | x / 868d2e0eb19c (4) D + | / | x a8df460dbbfe (3) C - | folded(description, content) as d15d0ffc75f6 using fold by test (Thu Jan 01 00:00:00 1970 +0000) | x c473644ee0e9 (2) B - folded(description, parent, content) as b868bc49b0a4 using fold by test (Thu Jan 01 00:00:00 1970 +0000)