--- a/tests/test-evolve-obshistory-complex.t Mon Apr 23 12:23:00 2018 +0200
+++ b/tests/test-evolve-obshistory-complex.t Wed Apr 25 01:58:45 2018 +0100
@@ -79,11 +79,11 @@
@ 100cc25b765f (9) fold2
|\
x | 0da815c333f6 (5) E
- / rewritten as 100cc25b765f by test (Thu Jan 01 00:00:00 1970 +0000)
+ / rewritten(description, content) as 100cc25b765f by test (Thu Jan 01 00:00:00 1970 +0000)
| note: folding changesets to test
|
x d9f908fde1a1 (6) F
- rewritten as 100cc25b765f by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description, parent, content) as 100cc25b765f by test (Thu Jan 01 00:00:00 1970 +0000)
note: folding changesets to test
$ hg log -G
@@ -387,25 +387,25 @@
o 7b3290f6e0a0 (12) fold1
|\
x | d15d0ffc75f6 (8) fold1
- |\ \ rewritten as 7b3290f6e0a0, d0f33db50670 by test (Thu Jan 01 00:00:00 1970 +0000)
+ |\ \ rewritten(parent, content) as 7b3290f6e0a0, d0f33db50670 by test (Thu Jan 01 00:00:00 1970 +0000)
| | |
| | x e036916b63ea (11) fold0
- | | | rewritten as 7b3290f6e0a0 by test (Thu Jan 01 00:00:00 1970 +0000)
+ | | | rewritten(description, parent, content) as 7b3290f6e0a0 by test (Thu Jan 01 00:00:00 1970 +0000)
| | |
x | | 868d2e0eb19c (4) D
- / / rewritten as d15d0ffc75f6 by test (Thu Jan 01 00:00:00 1970 +0000)
+ / / rewritten(description, parent, content) as d15d0ffc75f6 by test (Thu Jan 01 00:00:00 1970 +0000)
| |
x | a8df460dbbfe (3) C
- / rewritten as d15d0ffc75f6 by test (Thu Jan 01 00:00:00 1970 +0000)
+ / rewritten(description, content) as d15d0ffc75f6 by test (Thu Jan 01 00:00:00 1970 +0000)
|
x b868bc49b0a4 (7) fold0
- |\ rewritten as 19e14c8397fc, e036916b63ea by test (Thu Jan 01 00:00:00 1970 +0000)
+ |\ rewritten(parent, content) as 19e14c8397fc, e036916b63ea by test (Thu Jan 01 00:00:00 1970 +0000)
| |
x | 2a34000d3544 (1) A
- / rewritten as b868bc49b0a4 by test (Thu Jan 01 00:00:00 1970 +0000)
+ / rewritten(description, content) as b868bc49b0a4 by test (Thu Jan 01 00:00:00 1970 +0000)
|
x c473644ee0e9 (2) B
- rewritten as b868bc49b0a4 by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description, parent, content) as b868bc49b0a4 by test (Thu Jan 01 00:00:00 1970 +0000)
While with all option, we should see 15 changesets
@@ -419,38 +419,38 @@
| | | | o ec31316faa9d (14) fold2
| | | |/|
| | | x | 100cc25b765f (9) fold2
- | | | |\ \ rewritten as d4a000f63ee9, ec31316faa9d by test (Thu Jan 01 00:00:00 1970 +0000)
+ | | | |\ \ rewritten(parent, content) as d4a000f63ee9, ec31316faa9d by test (Thu Jan 01 00:00:00 1970 +0000)
| | | | | |
| +-------x d0f33db50670 (13) fold1
- | | | | | rewritten as ec31316faa9d by test (Thu Jan 01 00:00:00 1970 +0000)
+ | | | | | rewritten(description, parent, content) as ec31316faa9d by test (Thu Jan 01 00:00:00 1970 +0000)
| | | | | note: this is a note stored in obsmarker in prune
| | | | |
+---x | | e036916b63ea (11) fold0
- | | / / rewritten as 7b3290f6e0a0 by test (Thu Jan 01 00:00:00 1970 +0000)
+ | | / / rewritten(description, parent, content) as 7b3290f6e0a0 by test (Thu Jan 01 00:00:00 1970 +0000)
| | | |
| | x | 0da815c333f6 (5) E
- | | / rewritten as 100cc25b765f by test (Thu Jan 01 00:00:00 1970 +0000)
+ | | / rewritten(description, content) as 100cc25b765f by test (Thu Jan 01 00:00:00 1970 +0000)
| | | note: folding changesets to test
| | |
x | | b868bc49b0a4 (7) fold0
- |\ \ \ rewritten as 19e14c8397fc, e036916b63ea by test (Thu Jan 01 00:00:00 1970 +0000)
+ |\ \ \ rewritten(parent, content) as 19e14c8397fc, e036916b63ea by test (Thu Jan 01 00:00:00 1970 +0000)
| | | |
| | x | d15d0ffc75f6 (8) fold1
- | | |\ \ rewritten as 7b3290f6e0a0, d0f33db50670 by test (Thu Jan 01 00:00:00 1970 +0000)
+ | | |\ \ rewritten(parent, content) as 7b3290f6e0a0, d0f33db50670 by test (Thu Jan 01 00:00:00 1970 +0000)
| | | | |
| | | | x d9f908fde1a1 (6) F
- | | | | rewritten as 100cc25b765f by test (Thu Jan 01 00:00:00 1970 +0000)
+ | | | | rewritten(description, parent, content) as 100cc25b765f by test (Thu Jan 01 00:00:00 1970 +0000)
| | | | note: folding changesets to test
| | | |
x | | | 2a34000d3544 (1) A
- / / / rewritten as b868bc49b0a4 by test (Thu Jan 01 00:00:00 1970 +0000)
+ / / / rewritten(description, content) as b868bc49b0a4 by test (Thu Jan 01 00:00:00 1970 +0000)
| | |
| x | 868d2e0eb19c (4) D
- | / rewritten as d15d0ffc75f6 by test (Thu Jan 01 00:00:00 1970 +0000)
+ | / rewritten(description, parent, content) as d15d0ffc75f6 by test (Thu Jan 01 00:00:00 1970 +0000)
| |
| x a8df460dbbfe (3) C
- | rewritten as d15d0ffc75f6 by test (Thu Jan 01 00:00:00 1970 +0000)
+ | rewritten(description, content) as d15d0ffc75f6 by test (Thu Jan 01 00:00:00 1970 +0000)
|
x c473644ee0e9 (2) B
- rewritten as b868bc49b0a4 by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description, parent, content) as b868bc49b0a4 by test (Thu Jan 01 00:00:00 1970 +0000)