Mercurial > evolve
diff tests/test-evolve-templates.t @ 3108:9c9c8c1eeb93 mercurial-4.2
test-compat: merge with mercurial-4.3 branch
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Fri, 20 Oct 2017 18:34:22 +0200 |
parents | a867d59ea97a 67b59d1657cf |
children | 3024ae293732 3e2abd40da07 |
line wrap: on
line diff
--- a/tests/test-evolve-templates.t Fri Oct 20 18:25:05 2017 +0200 +++ b/tests/test-evolve-templates.t Fri Oct 20 18:34:22 2017 +0200 @@ -47,19 +47,16 @@ |/ parent: 0:ea207398892e | user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | obsolete: reworded as d004c8f274b9 by test2 | 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 as a468dc9b3633 | summary: A0 | o changeset: 0:ea207398892e @@ -79,18 +76,18 @@ o d004c8f274b9 (4) A2 | x a468dc9b3633 (3) A1 - | rewritten(description) as d004c8f274b9 by test2 (Thu Apr 19 04:25:21 2001 +0000) + | rewritten(description) as d004c8f274b9 by test2 (*) (glob) | @ 471f378eab4c (1) A0 - rewritten(description, content) as a468dc9b3633 by test (Fri Feb 13 23:31:30 2009 +0000) + rewritten(description, content) as a468dc9b3633 by test (*) (glob) $ hg tlog o d004c8f274b9 - | Precursors: 1:471f378eab4c - | semi-colon: 1:471f378eab4c + | Precursors: 471f378eab4c + | semi-colon: 471f378eab4c | @ 471f378eab4c - |/ Successors: 4:d004c8f274b9 - | semi-colon: 4:d004c8f274b9 + |/ Successors: [d004c8f274b9] + | semi-colon: [d004c8f274b9] | Fate: rewritten as d004c8f274b9 by test, test2 | o ea207398892e @@ -107,7 +104,6 @@ | @ changeset: 1:471f378eab4c |/ user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | obsolete: rewritten as d004c8f274b9 by test, test2 | summary: A0 | o changeset: 0:ea207398892e @@ -137,7 +133,7 @@ o d004c8f274b9 | | @ 471f378eab4c - |/ Obsfate: rewritten as d004c8f274b9 by test, test2 (between 2001-04-19 04:25 +0000 and 2009-02-13 23:31 +0000) + |/ Obsfate: rewritten as d004c8f274b9 by test, test2 (*) (glob) | o ea207398892e @@ -168,11 +164,11 @@ Precursors template should show current revision as it is the working copy $ hg tlog o d004c8f274b9 - | Precursors: 3:a468dc9b3633 - | semi-colon: 3:a468dc9b3633 + | Precursors: a468dc9b3633 + | semi-colon: a468dc9b3633 | @ a468dc9b3633 - |/ Successors: 4:d004c8f274b9 - | semi-colon: 4:d004c8f274b9 + |/ Successors: [d004c8f274b9] + | semi-colon: [d004c8f274b9] | Fate: reworded as d004c8f274b9 by test2 | o ea207398892e @@ -181,25 +177,33 @@ --hidden $ hg tlog --hidden o d004c8f274b9 - | Precursors: 3:a468dc9b3633 - | semi-colon: 3:a468dc9b3633 + | Precursors: a468dc9b3633 + | semi-colon: a468dc9b3633 | @ a468dc9b3633 - |/ Precursors: 1:471f378eab4c - | semi-colon: 1:471f378eab4c - | Successors: 4:d004c8f274b9 - | semi-colon: 4:d004c8f274b9 + |/ Precursors: 471f378eab4c + | semi-colon: 471f378eab4c + | Successors: [d004c8f274b9] + | semi-colon: [d004c8f274b9] | Fate: reworded as d004c8f274b9 by test2 | | x f137d23bb3e1 | | Fate: pruned | | | x 471f378eab4c - |/ Successors: 3:a468dc9b3633 - | semi-colon: 3:a468dc9b3633 + |/ Successors: [a468dc9b3633] + | semi-colon: [a468dc9b3633] | Fate: rewritten as a468dc9b3633 | o ea207398892e + $ hg fatelog -v + o d004c8f274b9 + | + | @ a468dc9b3633 + |/ Obsfate: reworded as d004c8f274b9 by test2 (*) (glob) + | + o ea207398892e + $ hg up 'desc(A2)' 0 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg tlog @@ -209,21 +213,21 @@ $ hg tlog --hidden @ d004c8f274b9 - | Precursors: 3:a468dc9b3633 - | semi-colon: 3:a468dc9b3633 + | Precursors: a468dc9b3633 + | semi-colon: a468dc9b3633 | x a468dc9b3633 - |/ Precursors: 1:471f378eab4c - | semi-colon: 1:471f378eab4c - | Successors: 4:d004c8f274b9 - | semi-colon: 4:d004c8f274b9 + |/ Precursors: 471f378eab4c + | semi-colon: 471f378eab4c + | Successors: [d004c8f274b9] + | semi-colon: [d004c8f274b9] | Fate: reworded as d004c8f274b9 by test2 | | x f137d23bb3e1 | | Fate: pruned | | | x 471f378eab4c - |/ Successors: 3:a468dc9b3633 - | semi-colon: 3:a468dc9b3633 + |/ Successors: [a468dc9b3633] + | semi-colon: [a468dc9b3633] | Fate: rewritten as a468dc9b3633 | o ea207398892e @@ -238,13 +242,13 @@ @ d004c8f274b9 | | x a468dc9b3633 - |/ Obsfate: reworded as d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000) + |/ Obsfate: reworded as d004c8f274b9 by test2 (*) (glob) | | x f137d23bb3e1 - | | Obsfate: pruned by test (at 2009-02-13 23:31 +0000) + | | Obsfate: pruned by test (at *) (glob) | | | x 471f378eab4c - |/ Obsfate: rewritten as a468dc9b3633 by test (at 2009-02-13 23:31 +0000) + |/ Obsfate: rewritten as a468dc9b3633 by test (*) (glob) | o ea207398892e @@ -252,11 +256,11 @@ $ hg fatelogjson --hidden @ d004c8f274b9 [] | - | x a468dc9b3633 [{"markers": [["a468dc9b36338b14fdb7825f55ce3df4e71517ad", ["d004c8f274b9ec480a47a93c10dac5eee63adb78"], 0, [["ef1", "1"], ["user", "test2"]], [987654321.0, 0], null]], "max_date": [987654321.0, 0], "min_date": [987654321.0, 0], "successors": ["d004c8f274b9ec480a47a93c10dac5eee63adb78"], "users": ["test2"], "verb": "reworded"}] + | x a468dc9b3633 [{"markers": [["a468dc9b36338b14fdb7825f55ce3df4e71517ad", ["d004c8f274b9ec480a47a93c10dac5eee63adb78"], 0, [["ef1", "1"], ["user", "test2"]], [*, *], null]], "max_date": [*, *], "min_date": [*, *], "successors": ["d004c8f274b9ec480a47a93c10dac5eee63adb78"], "users": ["test2"], "verb": "reworded"}] (glob) |/ - | x f137d23bb3e1 [{"markers": [["f137d23bb3e11dc1daeb6264fac9cb2433782e15", [], 0, [["ef1", "0"], ["user", "test"]], [1234567890.0, 0], ["471f378eab4c5e25f6c77f785b27c936efb22874"]]], "max_date": [1234567890.0, 0], "min_date": [1234567890.0, 0], "successors": [], "users": ["test"], "verb": "pruned"}] + | x f137d23bb3e1 [{"markers": [["f137d23bb3e11dc1daeb6264fac9cb2433782e15", [], 0, [["ef1", "0"], ["user", "test"]], [*, 0], ["471f378eab4c5e25f6c77f785b27c936efb22874"]]], "max_date": [*, 0], "min_date": [*, 0], "successors": [], "users": ["test"], "verb": "pruned"}] (glob) | | - | x 471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"], 0, [["ef1", "9"], ["user", "test"]], [1234567890.0, 0], null]], "max_date": [1234567890.0, 0], "min_date": [1234567890.0, 0], "successors": ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"], "users": ["test"], "verb": "rewritten"}] + | x 471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"], 0, [["ef1", "9"], ["user", "test"]], [*, 0], null]], "max_date": [*, 0], "min_date": [*, 0], "successors": ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"], "users": ["test"], "verb": "rewritten"}] (glob) |/ o ea207398892e [] @@ -335,7 +339,6 @@ | x changeset: 1:471597cad322 |/ user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | obsolete: split as 337fec4d2edc, f257fde29c7a | summary: A0 | o changeset: 0:ea207398892e @@ -355,14 +358,14 @@ Precursors template should show current revision as it is the working copy $ hg tlog o f257fde29c7a - | Precursors: 1:471597cad322 - | semi-colon: 1:471597cad322 + | Precursors: 471597cad322 + | semi-colon: 471597cad322 o 337fec4d2edc - | Precursors: 1:471597cad322 - | semi-colon: 1:471597cad322 + | Precursors: 471597cad322 + | semi-colon: 471597cad322 | @ 471597cad322 - |/ Successors: 2:337fec4d2edc 3:f257fde29c7a - | semi-colon: 2:337fec4d2edc 3:f257fde29c7a + |/ Successors: [337fec4d2edc, f257fde29c7a] + | semi-colon: [337fec4d2edc, f257fde29c7a] | Fate: split as 337fec4d2edc, f257fde29c7a | o ea207398892e @@ -394,14 +397,14 @@ --hidden $ hg tlog --hidden @ f257fde29c7a - | Precursors: 1:471597cad322 - | semi-colon: 1:471597cad322 + | Precursors: 471597cad322 + | semi-colon: 471597cad322 o 337fec4d2edc - | Precursors: 1:471597cad322 - | semi-colon: 1:471597cad322 + | Precursors: 471597cad322 + | semi-colon: 471597cad322 | x 471597cad322 - |/ Successors: 2:337fec4d2edc 3:f257fde29c7a - | semi-colon: 2:337fec4d2edc 3:f257fde29c7a + |/ Successors: [337fec4d2edc, f257fde29c7a] + | semi-colon: [337fec4d2edc, f257fde29c7a] | Fate: split as 337fec4d2edc, f257fde29c7a | o ea207398892e @@ -422,7 +425,7 @@ | o 337fec4d2edc [] | - | x 471597cad322 [{"markers": [["471597cad322d1f659bb169751be9133dad92ef3", ["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"], 0, [["ef1", "12"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"], "users": ["test"], "verb": "split"}] + | x 471597cad322 [{"markers": [["471597cad322d1f659bb169751be9133dad92ef3", ["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"], 0, [["ef1", "12"], ["user", "test"]], [*, 0], null]], "max_date": [*, 0], "min_date": [*, 0], "successors": ["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"], "users": ["test"], "verb": "split"}] (glob) |/ o ea207398892e [] @@ -469,13 +472,11 @@ | x changeset: 2:0dec01379d3b | | user: test | | date: Thu Jan 01 00:00:00 1970 +0000 - | | obsolete: rewritten as eb5a0daa2192 | | summary: B0 | | | x changeset: 1:471f378eab4c |/ user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | obsolete: rewritten as eb5a0daa2192 | summary: A0 | o changeset: 0:ea207398892e @@ -494,11 +495,11 @@ Precursors template should show current revision as it is the working copy $ hg tlog o eb5a0daa2192 - | Precursors: 1:471f378eab4c - | semi-colon: 1:471f378eab4c + | Precursors: 471f378eab4c + | semi-colon: 471f378eab4c | @ 471f378eab4c - |/ Successors: 3:eb5a0daa2192 - | semi-colon: 3:eb5a0daa2192 + |/ Successors: [eb5a0daa2192] + | semi-colon: [eb5a0daa2192] | Fate: rewritten as eb5a0daa2192 | o ea207398892e @@ -520,16 +521,16 @@ displayed $ hg tlog o eb5a0daa2192 - | Precursors: 2:0dec01379d3b 1:471f378eab4c - | semi-colon: 2:0dec01379d3b; 1:471f378eab4c + | Precursors: 0dec01379d3b 471f378eab4c + | semi-colon: 0dec01379d3b; 471f378eab4c | @ 0dec01379d3b - | | Successors: 3:eb5a0daa2192 - | | semi-colon: 3:eb5a0daa2192 + | | Successors: [eb5a0daa2192] + | | semi-colon: [eb5a0daa2192] | | Fate: rewritten as eb5a0daa2192 | | | x 471f378eab4c - |/ Successors: 3:eb5a0daa2192 - | semi-colon: 3:eb5a0daa2192 + |/ Successors: [eb5a0daa2192] + | semi-colon: [eb5a0daa2192] | Fate: rewritten as eb5a0daa2192 | o ea207398892e @@ -560,16 +561,16 @@ --hidden $ hg tlog --hidden @ eb5a0daa2192 - | Precursors: 2:0dec01379d3b 1:471f378eab4c - | semi-colon: 2:0dec01379d3b; 1:471f378eab4c + | Precursors: 0dec01379d3b 471f378eab4c + | semi-colon: 0dec01379d3b; 471f378eab4c | x 0dec01379d3b - | | Successors: 3:eb5a0daa2192 - | | semi-colon: 3:eb5a0daa2192 + | | Successors: [eb5a0daa2192] + | | semi-colon: [eb5a0daa2192] | | Fate: rewritten as eb5a0daa2192 | | | x 471f378eab4c - |/ Successors: 3:eb5a0daa2192 - | semi-colon: 3:eb5a0daa2192 + |/ Successors: [eb5a0daa2192] + | semi-colon: [eb5a0daa2192] | Fate: rewritten as eb5a0daa2192 | o ea207398892e @@ -589,9 +590,9 @@ $ hg fatelogjson --hidden @ eb5a0daa2192 [] | - | x 0dec01379d3b [{"markers": [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["ef1", "13"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], "users": ["test"], "verb": "rewritten"}] + | x 0dec01379d3b [{"markers": [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["ef1", "13"], ["user", "test"]], [*, 0], null]], "max_date": [*, 0], "min_date": [*, 0], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], "users": ["test"], "verb": "rewritten"}] (glob) | | - | x 471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["ef1", "9"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], "users": ["test"], "verb": "rewritten"}] + | x 471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["ef1", "9"], ["user", "test"]], [*, 0], null]], "max_date": [*, 0], "min_date": [*, 0], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], "users": ["test"], "verb": "rewritten"}] (glob) |/ o ea207398892e [] @@ -618,7 +619,6 @@ | x changeset: 1:471f378eab4c |/ user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | obsolete: reworded as fdf9bde5129a | summary: A0 | o changeset: 0:ea207398892e @@ -651,8 +651,6 @@ | x changeset: 1:471f378eab4c |/ user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | obsolete: reworded as fdf9bde5129a - | obsolete: reworded as 65b757b745b9 | summary: A0 | o changeset: 0:ea207398892e @@ -673,14 +671,14 @@ Precursors template should show current revision as it is the working copy $ hg tlog o 019fadeab383 - | Precursors: 1:471f378eab4c - | semi-colon: 1:471f378eab4c + | Precursors: 471f378eab4c + | semi-colon: 471f378eab4c | o fdf9bde5129a - |/ Precursors: 1:471f378eab4c - | semi-colon: 1:471f378eab4c + |/ Precursors: 471f378eab4c + | semi-colon: 471f378eab4c | @ 471f378eab4c - |/ Successors: 2:fdf9bde5129a; 4:019fadeab383 - | semi-colon: 2:fdf9bde5129a; 4:019fadeab383 + |/ Successors: [fdf9bde5129a], [019fadeab383] + | semi-colon: [fdf9bde5129a]; [019fadeab383] | Fate: reworded as fdf9bde5129a | Fate: reworded as 019fadeab383 | @@ -719,21 +717,21 @@ Precursors template should a precursor as we force its display with --hidden $ hg tlog --hidden o 019fadeab383 - | Precursors: 3:65b757b745b9 - | semi-colon: 3:65b757b745b9 + | Precursors: 65b757b745b9 + | semi-colon: 65b757b745b9 | x 65b757b745b9 - |/ Precursors: 1:471f378eab4c - | semi-colon: 1:471f378eab4c - | Successors: 4:019fadeab383 - | semi-colon: 4:019fadeab383 + |/ Precursors: 471f378eab4c + | semi-colon: 471f378eab4c + | Successors: [019fadeab383] + | semi-colon: [019fadeab383] | Fate: reworded as 019fadeab383 | | @ fdf9bde5129a - |/ Precursors: 1:471f378eab4c - | semi-colon: 1:471f378eab4c + |/ Precursors: 471f378eab4c + | semi-colon: 471f378eab4c | x 471f378eab4c - |/ Successors: 2:fdf9bde5129a; 3:65b757b745b9 - | semi-colon: 2:fdf9bde5129a; 3:65b757b745b9 + |/ Successors: [fdf9bde5129a], [65b757b745b9] + | semi-colon: [fdf9bde5129a]; [65b757b745b9] | Fate: reworded as fdf9bde5129a | Fate: reworded as 65b757b745b9 | @@ -756,11 +754,11 @@ $ hg fatelogjson --hidden o 019fadeab383 [] | - | x 65b757b745b9 [{"markers": [["65b757b745b935093c87a2bccd877521cccffcbd", ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"], 0, [["ef1", "1"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"], "users": ["test"], "verb": "reworded"}] + | x 65b757b745b9 [{"markers": [["65b757b745b935093c87a2bccd877521cccffcbd", ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"], 0, [["ef1", "1"], ["user", "test"]], [*, *], null]], "max_date": [*, *], "min_date": [*, *], "successors": ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"], "users": ["test"], "verb": "reworded"}] (glob) |/ | @ fdf9bde5129a [] |/ - | x 471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], 0, [["ef1", "1"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], "users": ["test"], "verb": "reworded"}, {"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["65b757b745b935093c87a2bccd877521cccffcbd"], 0, [["ef1", "1"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["65b757b745b935093c87a2bccd877521cccffcbd"], "users": ["test"], "verb": "reworded"}] + | x 471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], 0, [["ef1", "1"], ["user", "test"]], [*, *], null]], "max_date": [*, *], "min_date": [*, *], "successors": ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], "users": ["test"], "verb": "reworded"}, {"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["65b757b745b935093c87a2bccd877521cccffcbd"], 0, [["ef1", "1"], ["user", "test"]], [*, *], null]], "max_date": [*, *], "min_date": [*, *], "successors": ["65b757b745b935093c87a2bccd877521cccffcbd"], "users": ["test"], "verb": "reworded"}] (glob) |/ o ea207398892e [] @@ -788,7 +786,6 @@ | x changeset: 2:0dec01379d3b |/ user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | obsolete: reworded as b7ea6d14e664 | summary: B0 | o changeset: 1:471f378eab4c @@ -816,19 +813,16 @@ | | parent: 1:471f378eab4c | | user: test | | date: Thu Jan 01 00:00:00 1970 +0000 - | | obsolete: rewritten as eb5a0daa2192 | | summary: B1 | | | | x changeset: 2:0dec01379d3b | |/ user: test | | date: Thu Jan 01 00:00:00 1970 +0000 - | | obsolete: reworded as b7ea6d14e664 | | summary: B0 | | | x changeset: 1:471f378eab4c |/ user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | obsolete: rewritten as eb5a0daa2192 | summary: A0 | o changeset: 0:ea207398892e @@ -845,11 +839,11 @@ (use 'hg evolve' to update to its successor: eb5a0daa2192) $ hg tlog o eb5a0daa2192 - | Precursors: 1:471f378eab4c - | semi-colon: 1:471f378eab4c + | Precursors: 471f378eab4c + | semi-colon: 471f378eab4c | @ 471f378eab4c - |/ Successors: 4:eb5a0daa2192 - | semi-colon: 4:eb5a0daa2192 + |/ Successors: [eb5a0daa2192] + | semi-colon: [eb5a0daa2192] | Fate: rewritten as eb5a0daa2192 | o ea207398892e @@ -868,16 +862,16 @@ (use 'hg evolve' to update to its successor: eb5a0daa2192) $ hg tlog o eb5a0daa2192 - | Precursors: 2:0dec01379d3b 1:471f378eab4c - | semi-colon: 2:0dec01379d3b; 1:471f378eab4c + | Precursors: 0dec01379d3b 471f378eab4c + | semi-colon: 0dec01379d3b; 471f378eab4c | @ 0dec01379d3b - | | Successors: 4:eb5a0daa2192 - | | semi-colon: 4:eb5a0daa2192 + | | Successors: [eb5a0daa2192] + | | semi-colon: [eb5a0daa2192] | | Fate: rewritten as eb5a0daa2192 | | | x 471f378eab4c - |/ Successors: 4:eb5a0daa2192 - | semi-colon: 4:eb5a0daa2192 + |/ Successors: [eb5a0daa2192] + | semi-colon: [eb5a0daa2192] | Fate: rewritten as eb5a0daa2192 | o ea207398892e @@ -900,16 +894,16 @@ (use 'hg evolve' to update to its successor: eb5a0daa2192) $ hg tlog o eb5a0daa2192 - | Precursors: 1:471f378eab4c 3:b7ea6d14e664 - | semi-colon: 1:471f378eab4c; 3:b7ea6d14e664 + | Precursors: 471f378eab4c b7ea6d14e664 + | semi-colon: 471f378eab4c; b7ea6d14e664 | @ b7ea6d14e664 - | | Successors: 4:eb5a0daa2192 - | | semi-colon: 4:eb5a0daa2192 + | | Successors: [eb5a0daa2192] + | | semi-colon: [eb5a0daa2192] | | Fate: rewritten as eb5a0daa2192 | | | x 471f378eab4c - |/ Successors: 4:eb5a0daa2192 - | semi-colon: 4:eb5a0daa2192 + |/ Successors: [eb5a0daa2192] + | semi-colon: [eb5a0daa2192] | Fate: rewritten as eb5a0daa2192 | o ea207398892e @@ -935,23 +929,23 @@ $ hg tlog --hidden @ eb5a0daa2192 - | Precursors: 1:471f378eab4c 3:b7ea6d14e664 - | semi-colon: 1:471f378eab4c; 3:b7ea6d14e664 + | Precursors: 471f378eab4c b7ea6d14e664 + | semi-colon: 471f378eab4c; b7ea6d14e664 | x b7ea6d14e664 - | | Precursors: 2:0dec01379d3b - | | semi-colon: 2:0dec01379d3b - | | Successors: 4:eb5a0daa2192 - | | semi-colon: 4:eb5a0daa2192 + | | Precursors: 0dec01379d3b + | | semi-colon: 0dec01379d3b + | | Successors: [eb5a0daa2192] + | | semi-colon: [eb5a0daa2192] | | Fate: rewritten as eb5a0daa2192 | | | | x 0dec01379d3b - | |/ Successors: 3:b7ea6d14e664 - | | semi-colon: 3:b7ea6d14e664 + | |/ Successors: [b7ea6d14e664] + | | semi-colon: [b7ea6d14e664] | | Fate: reworded as b7ea6d14e664 | | | x 471f378eab4c - |/ Successors: 4:eb5a0daa2192 - | semi-colon: 4:eb5a0daa2192 + |/ Successors: [eb5a0daa2192] + | semi-colon: [eb5a0daa2192] | Fate: rewritten as eb5a0daa2192 | o ea207398892e @@ -973,11 +967,11 @@ $ hg fatelogjson --hidden @ eb5a0daa2192 [] | - | x b7ea6d14e664 [{"markers": [["b7ea6d14e664bdc8922221f7992631b50da3fb07", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["ef1", "13"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], "users": ["test"], "verb": "rewritten"}] + | x b7ea6d14e664 [{"markers": [["b7ea6d14e664bdc8922221f7992631b50da3fb07", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["ef1", "13"], ["user", "test"]], [*, 0], null]], "max_date": [*, 0], "min_date": [*, 0], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], "users": ["test"], "verb": "rewritten"}] (glob) | | - | | x 0dec01379d3b [{"markers": [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", ["b7ea6d14e664bdc8922221f7992631b50da3fb07"], 0, [["ef1", "1"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["b7ea6d14e664bdc8922221f7992631b50da3fb07"], "users": ["test"], "verb": "reworded"}] + | | x 0dec01379d3b [{"markers": [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", ["b7ea6d14e664bdc8922221f7992631b50da3fb07"], 0, [["ef1", "1"], ["user", "test"]], [*, *], null]], "max_date": [*, *], "min_date": [*, *], "successors": ["b7ea6d14e664bdc8922221f7992631b50da3fb07"], "users": ["test"], "verb": "reworded"}] (glob) | |/ - | x 471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["ef1", "9"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], "users": ["test"], "verb": "rewritten"}] + | x 471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["ef1", "9"], ["user", "test"]], [*, 0], null]], "max_date": [*, 0], "min_date": [*, 0], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], "users": ["test"], "verb": "rewritten"}] (glob) |/ o ea207398892e [] @@ -1023,13 +1017,11 @@ |/ parent: 0:ea207398892e | user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | obsolete: reworded as 7a230b46bf61 | summary: A1 | | x changeset: 1:471f378eab4c |/ user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | obsolete: reworded as fdf9bde5129a | summary: A0 | o changeset: 0:ea207398892e @@ -1046,7 +1038,6 @@ adding file changes added 1 changesets with 0 changes to 1 files (+1 heads) 2 new obsolescence markers - obsoleted 1 changesets (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) @@ -1061,7 +1052,6 @@ | @ changeset: 1:471f378eab4c |/ user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | obsolete: reworded as 7a230b46bf61 | summary: A0 | o changeset: 0:ea207398892e @@ -1074,11 +1064,11 @@ $ hg tlog o 7a230b46bf61 - | Precursors: 1:471f378eab4c - | semi-colon: 1:471f378eab4c + | Precursors: 471f378eab4c + | semi-colon: 471f378eab4c | @ 471f378eab4c - |/ Successors: 2:7a230b46bf61 - | semi-colon: 2:7a230b46bf61 + |/ Successors: [7a230b46bf61] + | semi-colon: [7a230b46bf61] | Fate: reworded as 7a230b46bf61 | o ea207398892e @@ -1087,7 +1077,7 @@ o 7a230b46bf61 | | @ 471f378eab4c - |/ Obsfate: reworded as 7a230b46bf61 by test (at 1970-01-01 00:00 +0000) + |/ Obsfate: reworded as 7a230b46bf61 by test (*) (glob) | o ea207398892e @@ -1105,11 +1095,11 @@ $ hg tlog --hidden @ 7a230b46bf61 - | Precursors: 1:471f378eab4c - | semi-colon: 1:471f378eab4c + | Precursors: 471f378eab4c + | semi-colon: 471f378eab4c | x 471f378eab4c - |/ Successors: 2:7a230b46bf61 - | semi-colon: 2:7a230b46bf61 + |/ Successors: [7a230b46bf61] + | semi-colon: [7a230b46bf61] | Fate: reworded as 7a230b46bf61 | o ea207398892e @@ -1118,7 +1108,7 @@ @ 7a230b46bf61 | | x 471f378eab4c - |/ Obsfate: reworded as 7a230b46bf61 by test (at 1970-01-01 00:00 +0000) + |/ Obsfate: reworded as 7a230b46bf61 by test (*) (glob) | o ea207398892e @@ -1126,7 +1116,7 @@ $ hg fatelogjson --hidden @ 7a230b46bf61 [] | - | x 471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], 0, [["ef1", "1"], ["user", "test"]], [0.0, 0], null], ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e", ["7a230b46bf61e50b30308c6cfd7bd1269ef54702"], 0, [["ef1", "1"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["7a230b46bf61e50b30308c6cfd7bd1269ef54702"], "users": ["test"], "verb": "reworded"}] + | x 471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], 0, [["ef1", "1"], ["user", "test"]], [*, *], null], ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e", ["7a230b46bf61e50b30308c6cfd7bd1269ef54702"], 0, [["ef1", "1"], ["user", "test"]], [*, *], null]], "max_date": [*, *], "min_date": [*, *], "successors": ["7a230b46bf61e50b30308c6cfd7bd1269ef54702"], "users": ["test"], "verb": "reworded"}] (glob) |/ o ea207398892e [] @@ -1161,7 +1151,7 @@ $ hg fatelog -v @ 471f378eab4c - | Obsfate: pruned by test (at 1970-01-01 00:00 +0000) + | Obsfate: pruned by test (at *) (glob) | o ea207398892e