Mercurial > evolve
diff tests/test-evolve-obshistory.t @ 3591:98941c28f3e2 mercurial-4.3
test-compat: merge mercurial-4.4 into mercurial-4.3
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Wed, 21 Mar 2018 16:18:31 +0100 |
| parents | d5adce52cef4 85cdce113c2c |
| children | 7a5c3175015e a77fb9669e99 |
line wrap: on
line diff
--- a/tests/test-evolve-obshistory.t Wed Mar 21 16:06:17 2018 +0100 +++ b/tests/test-evolve-obshistory.t Wed Mar 21 16:18:31 2018 +0100 @@ -31,17 +31,23 @@ > > Better commit message" $ hg log --hidden -G - @ changeset: 2:4ae3a4151de9 + @ changeset: 3:4ae3a4151de9 | tag: tip | parent: 0:ea207398892e | user: test | date: Thu Jan 01 00:00:00 1970 +0000 | summary: A1 | + | x changeset: 2:f137d23bb3e1 + | | user: test + | | date: Thu Jan 01 00:00:00 1970 +0000 + | | obsolete: pruned + | | summary: temporary amend commit for 471f378eab4c + | | | x changeset: 1:471f378eab4c |/ user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | obsolete: rewritten using amend as 2:4ae3a4151de9 + | obsolete: rewritten as 4ae3a4151de9 | summary: A0 | o changeset: 0:ea207398892e @@ -52,10 +58,10 @@ Actual test ----------- $ hg obslog --patch 4ae3a4151de9 - @ 4ae3a4151de9 (2) A1 + @ 4ae3a4151de9 (3) A1 | x 471f378eab4c (1) A0 - rewritten(description, content) as 4ae3a4151de9 using amend by test (*) (glob) + rewritten(description, content) as 4ae3a4151de9 by test (Thu Jan 01 00:00:00 1970 +0000) diff -r 471f378eab4c -r 4ae3a4151de9 changeset-description --- a/changeset-description +++ b/changeset-description @@ -74,10 +80,10 @@ $ hg obslog --patch --color debug - @ [evolve.node|4ae3a4151de9] [evolve.rev|(2)] [evolve.short_description|A1] + @ [evolve.node|4ae3a4151de9] [evolve.rev|(3)] [evolve.short_description|A1] | x [evolve.node|471f378eab4c] [evolve.rev|(1)] [evolve.short_description|A0] - [evolve.verb|rewritten](description, content) as [evolve.node|4ae3a4151de9] using [evolve.operation|amend] by [evolve.user|test] [evolve.date|(Thu Jan 01 00:00:00 1970 +0000)] + [evolve.verb|rewritten](description, content) as [evolve.node|4ae3a4151de9] by [evolve.user|test] [evolve.date|(Thu Jan 01 00:00:00 1970 +0000)] [diff.diffline|diff -r 471f378eab4c -r 4ae3a4151de9 changeset-description] [diff.file_a|--- a/changeset-description] [diff.file_b|+++ b/changeset-description] @@ -97,9 +103,9 @@ $ hg obslog --no-graph --patch 4ae3a4151de9 - 4ae3a4151de9 (2) A1 + 4ae3a4151de9 (3) A1 471f378eab4c (1) A0 - rewritten(description, content) as 4ae3a4151de9 using amend by test (Thu Jan 01 00:00:00 1970 +0000) + rewritten(description, content) as 4ae3a4151de9 by test (Thu Jan 01 00:00:00 1970 +0000) diff -r 471f378eab4c -r 4ae3a4151de9 changeset-description --- a/changeset-description +++ b/changeset-description @@ -127,7 +133,7 @@ { "markers": [], "node": "4ae3a4151de9", - "rev": 2, + "rev": 3, "shortdescription": "A1" }, { @@ -141,7 +147,6 @@ "description", "content" ], - "operation": "amend", "succnodes": [ "4ae3a4151de9" ], @@ -156,7 +161,7 @@ ] $ hg obslog --hidden --patch 471f378eab4c x 471f378eab4c (1) A0 - rewritten(description, content) as 4ae3a4151de9 using amend by test (Thu Jan 01 00:00:00 1970 +0000) + rewritten(description, content) as 4ae3a4151de9 by test (Thu Jan 01 00:00:00 1970 +0000) diff -r 471f378eab4c -r 4ae3a4151de9 changeset-description --- a/changeset-description +++ b/changeset-description @@ -187,7 +192,6 @@ *, (glob) "content" ], - "operation": "amend", "succnodes": [ "4ae3a4151de9" ], @@ -246,7 +250,7 @@ | tag: tip | user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | obsolete: pruned using prune + | obsolete: pruned | summary: B0 | @ changeset: 1:471f378eab4c @@ -265,7 +269,7 @@ $ hg obslog 'desc(B0)' --hidden --patch x 0dec01379d3b (2) B0 - pruned using prune by test (Thu Jan 01 00:00:00 1970 +0000) + pruned by test (Thu Jan 01 00:00:00 1970 +0000) (No patch available, no successors) $ hg obslog 'desc(B0)' --hidden --no-graph -Tjson | python -m json.tool @@ -277,7 +281,6 @@ *, (glob) 0 (glob) ], - "operation": "prune", "user": "test", "verb": "pruned" } @@ -344,6 +347,7 @@ > y > y > EOF + current hg version does not support storing note in obsmarker 0 files updated, 0 files merged, 2 files removed, 0 files unresolved adding a adding b @@ -387,7 +391,7 @@ | x changeset: 1:471597cad322 |/ user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | obsolete: split using split as 2:337fec4d2edc, 3:f257fde29c7a + | obsolete: split as 337fec4d2edc, f257fde29c7a | summary: A0 | o changeset: 0:ea207398892e @@ -401,7 +405,7 @@ Check that debugobshistory on splitted commit show both targets $ hg obslog 471597cad322 --hidden --patch x 471597cad322 (1) A0 - rewritten(parent, content) as 337fec4d2edc, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000) + rewritten as 337fec4d2edc, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000) note: testing split (No patch available, too many successors (2)) @@ -414,12 +418,7 @@ *, (glob) 0 (glob) ], - "effect": [ - "parent", - "content" - ], "note": "testing split", - "operation": "split", "succnodes": [ "337fec4d2edc", "f257fde29c7a" @@ -439,7 +438,7 @@ o 337fec4d2edc (2) A0 | x 471597cad322 (1) A0 - rewritten(parent, content) as 337fec4d2edc, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000) + rewritten as 337fec4d2edc, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000) note: testing split (No patch available, too many successors (2)) @@ -450,7 +449,7 @@ | @ f257fde29c7a (3) A0 |/ x 471597cad322 (1) A0 - rewritten(parent, content) as 337fec4d2edc, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000) + rewritten as 337fec4d2edc, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000) note: testing split (No patch available, too many successors (2)) @@ -460,7 +459,7 @@ @ f257fde29c7a (3) A0 | x 471597cad322 (1) A0 - rewritten(parent, content) as 337fec4d2edc, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000) + rewritten as 337fec4d2edc, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000) note: testing split (No patch available, too many successors (2)) @@ -471,7 +470,7 @@ | @ f257fde29c7a (3) A0 |/ x 471597cad322 (1) A0 - rewritten(parent, content) as 337fec4d2edc, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000) + rewritten as 337fec4d2edc, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000) note: testing split (No patch available, too many successors (2)) @@ -482,7 +481,7 @@ | @ f257fde29c7a (3) A0 |/ x 471597cad322 (1) A0 - rewritten(parent, content) as 337fec4d2edc, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000) + rewritten as 337fec4d2edc, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000) note: testing split (No patch available, too many successors (2)) @@ -494,7 +493,7 @@ | @ f257fde29c7a (3) A0 |/ x 471597cad322 (1) A0 - rewritten(parent, content) as 337fec4d2edc, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000) + rewritten as 337fec4d2edc, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000) note: testing split (No patch available, too many successors (2)) @@ -650,7 +649,7 @@ | x changeset: 1:de7290d8b885 |/ user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | obsolete: split using split as 2:337fec4d2edc, 3:f257fde29c7a, 4:1ae8bc733a14, 5:c7f044602e9b + | obsolete: split as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a | summary: A0 | o changeset: 0:ea207398892e @@ -663,7 +662,7 @@ $ hg obslog de7290d8b885 --hidden --patch x de7290d8b885 (1) A0 - rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000) + rewritten as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000) (No patch available, too many successors (4)) $ hg obslog de7290d8b885 --hidden --all --patch @@ -676,7 +675,7 @@ | o f257fde29c7a (3) A0 |/ x de7290d8b885 (1) A0 - rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000) + rewritten as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000) (No patch available, too many successors (4)) $ hg obslog de7290d8b885 --hidden --no-graph -Tjson | python -m json.tool @@ -688,11 +687,6 @@ *, (glob) 0 (glob) ], - "effect": [ - "parent", - "content" - ], - "operation": "split", "succnodes": [ "1ae8bc733a14", "337fec4d2edc", @@ -712,7 +706,7 @@ @ c7f044602e9b (5) A0 | x de7290d8b885 (1) A0 - rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000) + rewritten as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000) (No patch available, too many successors (4)) $ hg obslog c7f044602e9b --no-graph -Tjson | python -m json.tool @@ -730,11 +724,6 @@ *, (glob) 0 (glob) ], - "effect": [ - "parent", - "content" - ], - "operation": "split", "succnodes": [ "1ae8bc733a14", "337fec4d2edc", @@ -761,7 +750,7 @@ | o f257fde29c7a (3) A0 |/ x de7290d8b885 (1) A0 - rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000) + rewritten as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000) (No patch available, too many successors (4)) $ hg obslog 5 --all --patch @@ -774,7 +763,7 @@ | o f257fde29c7a (3) A0 |/ x de7290d8b885 (1) A0 - rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000) + rewritten as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000) (No patch available, too many successors (4)) $ hg update de7290d8b885 @@ -828,13 +817,13 @@ | x changeset: 2:0dec01379d3b | | user: test | | date: Thu Jan 01 00:00:00 1970 +0000 - | | obsolete: rewritten using fold as 3:eb5a0daa2192 + | | obsolete: rewritten as eb5a0daa2192 | | summary: B0 | | | x changeset: 1:471f378eab4c |/ user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | obsolete: rewritten using fold as 3:eb5a0daa2192 + | obsolete: rewritten as eb5a0daa2192 | summary: A0 | o changeset: 0:ea207398892e @@ -849,7 +838,7 @@ the revision with the target $ hg obslog --hidden 471f378eab4c --patch x 471f378eab4c (1) A0 - rewritten(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000) + rewritten as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000) diff -r 471f378eab4c -r eb5a0daa2192 changeset-description --- a/changeset-description +++ b/changeset-description @@ -869,11 +858,11 @@ @ eb5a0daa2192 (3) C0 |\ x | 0dec01379d3b (2) B0 - / rewritten(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000) + / rewritten as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000) | (No patch available, changesets rebased) | x 471f378eab4c (1) A0 - rewritten(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000) + rewritten as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000) diff -r 471f378eab4c -r eb5a0daa2192 changeset-description --- a/changeset-description +++ b/changeset-description @@ -892,7 +881,7 @@ the revision with the target $ hg obslog --hidden 0dec01379d3b --patch x 0dec01379d3b (2) B0 - rewritten(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000) + rewritten as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000) (No patch available, changesets rebased) Check that with all option, all changesets are shown @@ -900,11 +889,11 @@ @ eb5a0daa2192 (3) C0 |\ x | 0dec01379d3b (2) B0 - / rewritten(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000) + / rewritten as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000) | (No patch available, changesets rebased) | x 471f378eab4c (1) A0 - rewritten(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000) + rewritten as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000) diff -r 471f378eab4c -r eb5a0daa2192 changeset-description --- a/changeset-description +++ b/changeset-description @@ -925,11 +914,11 @@ @ eb5a0daa2192 (3) C0 |\ x | 0dec01379d3b (2) B0 - / rewritten(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000) + / rewritten as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000) | (No patch available, changesets rebased) | x 471f378eab4c (1) A0 - rewritten(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000) + rewritten as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000) diff -r 471f378eab4c -r eb5a0daa2192 changeset-description --- a/changeset-description +++ b/changeset-description @@ -959,11 +948,6 @@ *, (glob) 0 (glob) ], - "effect": [ - "description", - "content" - ], - "operation": "fold", "succnodes": [ "eb5a0daa2192" ], @@ -982,12 +966,6 @@ *, (glob) 0 (glob) ], - "effect": [ - "description", - "parent", - "content" - ], - "operation": "fold", "succnodes": [ "eb5a0daa2192" ], @@ -1039,7 +1017,7 @@ | x changeset: 1:471f378eab4c |/ user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | obsolete: reworded using amend as 2:fdf9bde5129a + | obsolete: reworded as fdf9bde5129a | summary: A0 | o changeset: 0:ea207398892e @@ -1052,28 +1030,28 @@ working directory parent is obsolete! (471f378eab4c) (use 'hg evolve' to update to its successor: fdf9bde5129a) $ hg amend -m "A2" - 2 new content-divergent changesets + 2 new divergent changesets $ hg log --hidden -G @ changeset: 3:65b757b745b9 | tag: tip | parent: 0:ea207398892e | user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | instability: content-divergent + | trouble: divergent | summary: A2 | | o changeset: 2:fdf9bde5129a |/ parent: 0:ea207398892e | user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | instability: content-divergent + | trouble: divergent | summary: A1 | | x changeset: 1:471f378eab4c |/ user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | obsolete: reworded using amend as 2:fdf9bde5129a - | obsolete: reworded using amend as 3:65b757b745b9 + | obsolete: reworded as fdf9bde5129a + | obsolete: reworded as 65b757b745b9 | summary: A0 | o changeset: 0:ea207398892e @@ -1087,7 +1065,7 @@ Check that debugobshistory on the divergent revision show both destinations $ hg obslog --hidden 471f378eab4c --patch x 471f378eab4c (1) A0 - rewritten(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000) + rewritten(description) as 65b757b745b9 by test (Thu Jan 01 00:00:00 1970 +0000) diff -r 471f378eab4c -r 65b757b745b9 changeset-description --- a/changeset-description +++ b/changeset-description @@ -1095,7 +1073,7 @@ -A0 +A2 - rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000) + rewritten(description) as fdf9bde5129a by test (Thu Jan 01 00:00:00 1970 +0000) diff -r 471f378eab4c -r fdf9bde5129a changeset-description --- a/changeset-description +++ b/changeset-description @@ -1112,7 +1090,7 @@ | o fdf9bde5129a (2) A1 |/ x 471f378eab4c (1) A0 - rewritten(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000) + rewritten(description) as 65b757b745b9 by test (Thu Jan 01 00:00:00 1970 +0000) diff -r 471f378eab4c -r 65b757b745b9 changeset-description --- a/changeset-description +++ b/changeset-description @@ -1120,7 +1098,7 @@ -A0 +A2 - rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000) + rewritten(description) as fdf9bde5129a by test (Thu Jan 01 00:00:00 1970 +0000) diff -r 471f378eab4c -r fdf9bde5129a changeset-description --- a/changeset-description +++ b/changeset-description @@ -1141,7 +1119,6 @@ "effect": [ "description" ], - "operation": "amend", "succnodes": [ "65b757b745b9" ], @@ -1156,7 +1133,6 @@ "effect": [ "description" ], - "operation": "amend", "succnodes": [ "fdf9bde5129a" ], @@ -1175,7 +1151,7 @@ o fdf9bde5129a (2) A1 | x 471f378eab4c (1) A0 - rewritten(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000) + rewritten(description) as 65b757b745b9 by test (Thu Jan 01 00:00:00 1970 +0000) diff -r 471f378eab4c -r 65b757b745b9 changeset-description --- a/changeset-description +++ b/changeset-description @@ -1183,7 +1159,7 @@ -A0 +A2 - rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000) + rewritten(description) as fdf9bde5129a by test (Thu Jan 01 00:00:00 1970 +0000) diff -r 471f378eab4c -r fdf9bde5129a changeset-description --- a/changeset-description +++ b/changeset-description @@ -1200,7 +1176,7 @@ | o fdf9bde5129a (2) A1 |/ x 471f378eab4c (1) A0 - rewritten(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000) + rewritten(description) as 65b757b745b9 by test (Thu Jan 01 00:00:00 1970 +0000) diff -r 471f378eab4c -r 65b757b745b9 changeset-description --- a/changeset-description +++ b/changeset-description @@ -1208,7 +1184,7 @@ -A0 +A2 - rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000) + rewritten(description) as fdf9bde5129a by test (Thu Jan 01 00:00:00 1970 +0000) diff -r 471f378eab4c -r fdf9bde5129a changeset-description --- a/changeset-description +++ b/changeset-description @@ -1223,7 +1199,7 @@ @ 65b757b745b9 (3) A2 | x 471f378eab4c (1) A0 - rewritten(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000) + rewritten(description) as 65b757b745b9 by test (Thu Jan 01 00:00:00 1970 +0000) diff -r 471f378eab4c -r 65b757b745b9 changeset-description --- a/changeset-description +++ b/changeset-description @@ -1231,7 +1207,7 @@ -A0 +A2 - rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000) + rewritten(description) as fdf9bde5129a by test (Thu Jan 01 00:00:00 1970 +0000) diff -r 471f378eab4c -r fdf9bde5129a changeset-description --- a/changeset-description +++ b/changeset-description @@ -1247,7 +1223,7 @@ | o fdf9bde5129a (2) A1 |/ x 471f378eab4c (1) A0 - rewritten(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000) + rewritten(description) as 65b757b745b9 by test (Thu Jan 01 00:00:00 1970 +0000) diff -r 471f378eab4c -r 65b757b745b9 changeset-description --- a/changeset-description +++ b/changeset-description @@ -1255,7 +1231,7 @@ -A0 +A2 - rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000) + rewritten(description) as fdf9bde5129a by test (Thu Jan 01 00:00:00 1970 +0000) diff -r 471f378eab4c -r fdf9bde5129a changeset-description --- a/changeset-description +++ b/changeset-description @@ -1272,7 +1248,7 @@ | o fdf9bde5129a (2) A1 |/ x 471f378eab4c (1) A0 - rewritten(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000) + rewritten(description) as 65b757b745b9 by test (Thu Jan 01 00:00:00 1970 +0000) diff -r 471f378eab4c -r 65b757b745b9 changeset-description --- a/changeset-description +++ b/changeset-description @@ -1280,7 +1256,7 @@ -A0 +A2 - rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000) + rewritten(description) as fdf9bde5129a by test (Thu Jan 01 00:00:00 1970 +0000) diff -r 471f378eab4c -r fdf9bde5129a changeset-description --- a/changeset-description +++ b/changeset-description @@ -1307,7 +1283,6 @@ "effect": [ "description" ], - "operation": "amend", "succnodes": [ "65b757b745b9" ], @@ -1322,7 +1297,6 @@ "effect": [ "description" ], - "operation": "amend", "succnodes": [ "fdf9bde5129a" ], @@ -1373,7 +1347,7 @@ | x changeset: 2:0dec01379d3b |/ user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | obsolete: reworded using amend as 3:b7ea6d14e664 + | obsolete: reworded as b7ea6d14e664 | summary: B0 | o changeset: 1:471f378eab4c @@ -1401,19 +1375,19 @@ | | parent: 1:471f378eab4c | | user: test | | date: Thu Jan 01 00:00:00 1970 +0000 - | | obsolete: rewritten using fold as 4:eb5a0daa2192 + | | obsolete: rewritten as eb5a0daa2192 | | summary: B1 | | | | x changeset: 2:0dec01379d3b | |/ user: test | | date: Thu Jan 01 00:00:00 1970 +0000 - | | obsolete: reworded using amend as 3:b7ea6d14e664 + | | obsolete: reworded as b7ea6d14e664 | | summary: B0 | | | x changeset: 1:471f378eab4c |/ user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | obsolete: rewritten using fold as 4:eb5a0daa2192 + | obsolete: rewritten as eb5a0daa2192 | summary: A0 | o changeset: 0:ea207398892e @@ -1429,7 +1403,7 @@ @ eb5a0daa2192 (4) C0 |\ x | 471f378eab4c (1) A0 - / rewritten(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000) + / rewritten as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000) | diff -r 471f378eab4c -r eb5a0daa2192 changeset-description | --- a/changeset-description | +++ b/changeset-description @@ -1445,11 +1419,11 @@ | | x b7ea6d14e664 (3) B1 - | rewritten(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000) + | rewritten as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000) | (No patch available, changesets rebased) | x 0dec01379d3b (2) B0 - rewritten(description) as b7ea6d14e664 using amend by test (Thu Jan 01 00:00:00 1970 +0000) + rewritten(description) as b7ea6d14e664 by test (Thu Jan 01 00:00:00 1970 +0000) diff -r 0dec01379d3b -r b7ea6d14e664 changeset-description --- a/changeset-description +++ b/changeset-description @@ -1463,7 +1437,7 @@ @ eb5a0daa2192 (4) C0 |\ x | 471f378eab4c (1) A0 - / rewritten(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000) + / rewritten as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000) | diff -r 471f378eab4c -r eb5a0daa2192 changeset-description | --- a/changeset-description | +++ b/changeset-description @@ -1479,11 +1453,11 @@ | | x b7ea6d14e664 (3) B1 - | rewritten(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000) + | rewritten as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000) | (No patch available, changesets rebased) | x 0dec01379d3b (2) B0 - rewritten(description) as b7ea6d14e664 using amend by test (Thu Jan 01 00:00:00 1970 +0000) + rewritten(description) as b7ea6d14e664 by test (Thu Jan 01 00:00:00 1970 +0000) diff -r 0dec01379d3b -r b7ea6d14e664 changeset-description --- a/changeset-description +++ b/changeset-description @@ -1507,12 +1481,6 @@ *, (glob) 0 (glob) ], - "effect": [ - *, (glob) - *, (glob) - "content" - ], - "operation": "fold", "succnodes": [ "eb5a0daa2192" ], @@ -1534,7 +1502,6 @@ "effect": [ "description" ], - "operation": "amend", "succnodes": [ "b7ea6d14e664" ], @@ -1553,11 +1520,6 @@ *, (glob) 0 (glob) ], - "effect": [ - "description", - "content" - ], - "operation": "fold", "succnodes": [ "eb5a0daa2192" ], @@ -1640,13 +1602,13 @@ |/ parent: 0:ea207398892e | user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | obsolete: reworded using amend as 3:7a230b46bf61 + | obsolete: reworded as 7a230b46bf61 | summary: A1 | | x changeset: 1:471f378eab4c |/ user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | obsolete: reworded using amend as 2:fdf9bde5129a + | obsolete: reworded as fdf9bde5129a | summary: A0 | o changeset: 0:ea207398892e @@ -1661,7 +1623,7 @@ @ 7a230b46bf61 (3) A2 | x fdf9bde5129a (2) A1 - | rewritten(description) as 7a230b46bf61 using amend by test (Thu Jan 01 00:00:00 1970 +0000) + | rewritten(description) as 7a230b46bf61 by test (Thu Jan 01 00:00:00 1970 +0000) | diff -r fdf9bde5129a -r 7a230b46bf61 changeset-description | --- a/changeset-description | +++ b/changeset-description @@ -1671,7 +1633,7 @@ | | x 471f378eab4c (1) A0 - rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000) + rewritten(description) as fdf9bde5129a by test (Thu Jan 01 00:00:00 1970 +0000) diff -r 471f378eab4c -r fdf9bde5129a changeset-description --- a/changeset-description +++ b/changeset-description @@ -1690,7 +1652,6 @@ added 1 changesets with 0 changes to 1 files (+1 heads) 2 new obsolescence markers obsoleted 1 changesets - new changesets 7a230b46bf61 (run 'hg heads' to see heads, 'hg merge' to merge) working directory parent is obsolete! (471f378eab4c) (use 'hg evolve' to update to its successor: 7a230b46bf61) @@ -1700,21 +1661,21 @@ o 7a230b46bf61 (2) A2 | x fdf9bde5129a - | rewritten(description) as 7a230b46bf61 using amend by test (Thu Jan 01 00:00:00 1970 +0000) + | rewritten(description) as 7a230b46bf61 by test (Thu Jan 01 00:00:00 1970 +0000) | (No patch available, context is not local) | @ 471f378eab4c (1) A0 - rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000) + rewritten(description) as fdf9bde5129a by test (Thu Jan 01 00:00:00 1970 +0000) (No patch available, successor is unknown locally) $ hg obslog 7a230b46bf61 --color=debug --patch o [evolve.node|7a230b46bf61] [evolve.rev|(2)] [evolve.short_description|A2] | x [evolve.node evolve.missing_change_ctx|fdf9bde5129a] - | [evolve.verb|rewritten](description) as [evolve.node|7a230b46bf61] using [evolve.operation|amend] by [evolve.user|test] [evolve.date|(Thu Jan 01 00:00:00 1970 +0000)] + | [evolve.verb|rewritten](description) as [evolve.node|7a230b46bf61] by [evolve.user|test] [evolve.date|(Thu Jan 01 00:00:00 1970 +0000)] | (No patch available, context is not local) | @ [evolve.node|471f378eab4c] [evolve.rev|(1)] [evolve.short_description|A0] - [evolve.verb|rewritten](description) as [evolve.node|fdf9bde5129a] using [evolve.operation|amend] by [evolve.user|test] [evolve.date|(Thu Jan 01 00:00:00 1970 +0000)] + [evolve.verb|rewritten](description) as [evolve.node|fdf9bde5129a] by [evolve.user|test] [evolve.date|(Thu Jan 01 00:00:00 1970 +0000)] (No patch available, successor is unknown locally)