Mercurial > evolve
diff tests/test-evolve-obshistory-complex.t @ 3566:e6bea259c227
prune: include "operation" metadata in obsmarkers
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Mon, 12 Mar 2018 15:51:17 -0700 |
| parents | 589649021ea1 |
| children | 5ddea3b8d2a4 |
line wrap: on
line diff
--- a/tests/test-evolve-obshistory-complex.t Mon Mar 12 15:51:07 2018 -0700 +++ b/tests/test-evolve-obshistory-complex.t Mon Mar 12 15:51:17 2018 -0700 @@ -351,25 +351,25 @@ x | | changeset: 4:868d2e0eb19c | | | user: test | | | date: Thu Jan 01 00:00:00 1970 +0000 - | | | obsolete: split using fold as 12:7b3290f6e0a0, 14:ec31316faa9d + | | | obsolete: split using fold, prune as 12:7b3290f6e0a0, 14:ec31316faa9d | | | summary: D | | | x | | changeset: 3:a8df460dbbfe |/ / user: test | | date: Thu Jan 01 00:00:00 1970 +0000 - | | obsolete: split using fold as 12:7b3290f6e0a0, 14:ec31316faa9d + | | obsolete: split using fold, prune as 12:7b3290f6e0a0, 14:ec31316faa9d | | summary: C | | x | changeset: 2:c473644ee0e9 | | user: test | | date: Thu Jan 01 00:00:00 1970 +0000 - | | obsolete: split using fold as 10:19e14c8397fc, 12:7b3290f6e0a0 + | | obsolete: split using fold, prune as 10:19e14c8397fc, 12:7b3290f6e0a0 | | summary: B | | x | changeset: 1:2a34000d3544 |/ user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | obsolete: split using fold as 10:19e14c8397fc, 12:7b3290f6e0a0 + | obsolete: split using fold, prune as 10:19e14c8397fc, 12:7b3290f6e0a0 | summary: A | o changeset: 0:ea207398892e @@ -390,7 +390,7 @@ |\ \ rewritten(parent, content) as 7b3290f6e0a0, d0f33db50670 by test (Thu Jan 01 00:00:00 1970 +0000) | | | | | x e036916b63ea (11) fold0 - | | | rewritten(description, parent, content) as 7b3290f6e0a0 by test (Thu Jan 01 00:00:00 1970 +0000) + | | | rewritten(description, parent, content) as 7b3290f6e0a0 using prune by test (Thu Jan 01 00:00:00 1970 +0000) | | | x | | 868d2e0eb19c (4) D / / rewritten(description, parent, content) as d15d0ffc75f6 using fold by test (Thu Jan 01 00:00:00 1970 +0000) @@ -422,11 +422,11 @@ | | | |\ \ rewritten(parent, content) as d4a000f63ee9, ec31316faa9d by test (Thu Jan 01 00:00:00 1970 +0000) | | | | | | | +-------x d0f33db50670 (13) fold1 - | | | | | rewritten(description, parent, content) as ec31316faa9d by test (Thu Jan 01 00:00:00 1970 +0000) + | | | | | 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 | | | | | +---x | | e036916b63ea (11) fold0 - | | / / rewritten(description, parent, content) as 7b3290f6e0a0 by test (Thu Jan 01 00:00:00 1970 +0000) + | | / / rewritten(description, parent, content) as 7b3290f6e0a0 using prune by test (Thu Jan 01 00:00:00 1970 +0000) | | | | | | x | 0da815c333f6 (5) E | | / rewritten(description, content) as 100cc25b765f using fold by test (Thu Jan 01 00:00:00 1970 +0000)