--- a/tests/test-evolve-templates.t Wed Mar 21 16:06:17 2018 +0100
+++ b/tests/test-evolve-templates.t Wed Mar 21 16:18:31 2018 +0100
@@ -19,7 +19,7 @@
> {if(successors, "\n semi-colon: {join(successors, "; ")}")}\
> {if(obsfate, "\n Fate: {join(obsfate, "\n Fate: ")}\n")}\n'
> fatelog = log -G -T '{node|short}\n{if(obsfate, " Obsfate: {join(obsfate, "; ")}\n\n")}'
- > fatelogjson = log -G -T '{node|short} {obsfatedata|json}\n'
+ > fatelogjson = log -G -T '{node|short} {obsfate|json}\n'
> EOF
Test templates on amended commit
@@ -36,24 +36,30 @@
$ HGUSER=test hg amend -m "A1" --config devel.default-date="1234567890 0"
$ HGUSER=test2 hg amend -m "A2" --config devel.default-date="987654321 0"
$ hg log --hidden -G
- @ changeset: 3:d004c8f274b9
+ @ changeset: 4:d004c8f274b9
| tag: tip
| parent: 0:ea207398892e
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: A2
|
- | x changeset: 2:a468dc9b3633
+ | x changeset: 3:a468dc9b3633
|/ parent: 0:ea207398892e
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | obsolete: reworded using amend as 3:d004c8f274b9 by test2
+ | 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 using amend as 2:a468dc9b3633
+ | obsolete: rewritten as a468dc9b3633
| summary: A0
|
o changeset: 0:ea207398892e
@@ -70,28 +76,28 @@
Precursors template should show current revision as it is the working copy
$ hg olog tip
- o d004c8f274b9 (3) A2
+ o d004c8f274b9 (4) A2
|
- x a468dc9b3633 (2) A1
- | rewritten(description) as d004c8f274b9 using amend by test2 (Thu Apr 19 04:25:21 2001 +0000)
+ x a468dc9b3633 (3) A1
+ | rewritten(description) as d004c8f274b9 by test2 (Thu Apr 19 04:25:21 2001 +0000)
|
@ 471f378eab4c (1) A0
- rewritten(description, content) as a468dc9b3633 using amend by test (Fri Feb 13 23:31:30 2009 +0000)
+ rewritten(description, content) as a468dc9b3633 by test (Fri Feb 13 23:31:30 2009 +0000)
$ hg tlog
o d004c8f274b9
| Precursors: 1:471f378eab4c
| semi-colon: 1:471f378eab4c
| @ 471f378eab4c
- |/ Successors: 3:d004c8f274b9
- | semi-colon: 3:d004c8f274b9
- | Fate: rewritten using amend as 3:d004c8f274b9 by test, test2
+ |/ Successors: 4:d004c8f274b9
+ | semi-colon: 4:d004c8f274b9
+ | Fate: rewritten as d004c8f274b9 by test, test2
|
o ea207398892e
$ hg log -G
- o changeset: 3:d004c8f274b9
+ o changeset: 4:d004c8f274b9
| tag: tip
| parent: 0:ea207398892e
| user: test
@@ -101,7 +107,7 @@
| @ changeset: 1:471f378eab4c
|/ user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | obsolete: rewritten using amend as 3:d004c8f274b9 by test, test2
+ | obsolete: rewritten as d004c8f274b9 by test, test2
| summary: A0
|
o changeset: 0:ea207398892e
@@ -114,7 +120,7 @@
o d004c8f274b9
|
| @ 471f378eab4c
- |/ Obsfate: rewritten using amend as 3:d004c8f274b9
+ |/ Obsfate: rewritten as d004c8f274b9
|
o ea207398892e
@@ -123,7 +129,7 @@
o d004c8f274b9
|
| @ 471f378eab4c
- |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test, test2
+ |/ Obsfate: rewritten as d004c8f274b9 by test, test2
|
o ea207398892e
@@ -131,7 +137,7 @@
o d004c8f274b9
|
| @ 471f378eab4c
- |/ Obsfate: rewritten using amend as 3: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 (between 2001-04-19 04:25 +0000 and 2009-02-13 23:31 +0000)
|
o ea207398892e
@@ -162,12 +168,12 @@
Precursors template should show current revision as it is the working copy
$ hg tlog
o d004c8f274b9
- | Precursors: 2:a468dc9b3633
- | semi-colon: 2:a468dc9b3633
+ | Precursors: 3:a468dc9b3633
+ | semi-colon: 3:a468dc9b3633
| @ a468dc9b3633
- |/ Successors: 3:d004c8f274b9
- | semi-colon: 3:d004c8f274b9
- | Fate: reworded using amend as 3:d004c8f274b9 by test2
+ |/ Successors: 4:d004c8f274b9
+ | semi-colon: 4:d004c8f274b9
+ | Fate: reworded as d004c8f274b9 by test2
|
o ea207398892e
@@ -175,27 +181,22 @@
--hidden
$ hg tlog --hidden
o d004c8f274b9
- | Precursors: 2:a468dc9b3633
- | semi-colon: 2:a468dc9b3633
+ | Precursors: 3:a468dc9b3633
+ | semi-colon: 3:a468dc9b3633
| @ a468dc9b3633
|/ Precursors: 1:471f378eab4c
| semi-colon: 1:471f378eab4c
- | Successors: 3:d004c8f274b9
- | semi-colon: 3:d004c8f274b9
- | Fate: reworded using amend as 3:d004c8f274b9 by test2
+ | Successors: 4:d004c8f274b9
+ | semi-colon: 4:d004c8f274b9
+ | Fate: reworded as d004c8f274b9 by test2
|
+ | x f137d23bb3e1
+ | | Fate: pruned
+ | |
| x 471f378eab4c
- |/ Successors: 2:a468dc9b3633
- | semi-colon: 2:a468dc9b3633
- | Fate: rewritten using amend as 2:a468dc9b3633
- |
- o ea207398892e
-
- $ hg fatelog -v
- o d004c8f274b9
- |
- | @ a468dc9b3633
- |/ Obsfate: reworded using amend as 3:d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000)
+ |/ Successors: 3:a468dc9b3633
+ | semi-colon: 3:a468dc9b3633
+ | Fate: rewritten as a468dc9b3633
|
o ea207398892e
@@ -208,19 +209,22 @@
$ hg tlog --hidden
@ d004c8f274b9
- | Precursors: 2:a468dc9b3633
- | semi-colon: 2:a468dc9b3633
+ | Precursors: 3:a468dc9b3633
+ | semi-colon: 3:a468dc9b3633
| x a468dc9b3633
|/ Precursors: 1:471f378eab4c
| semi-colon: 1:471f378eab4c
- | Successors: 3:d004c8f274b9
- | semi-colon: 3:d004c8f274b9
- | Fate: reworded using amend as 3:d004c8f274b9 by test2
+ | Successors: 4:d004c8f274b9
+ | semi-colon: 4:d004c8f274b9
+ | Fate: reworded as d004c8f274b9 by test2
|
+ | x f137d23bb3e1
+ | | Fate: pruned
+ | |
| x 471f378eab4c
- |/ Successors: 2:a468dc9b3633
- | semi-colon: 2:a468dc9b3633
- | Fate: rewritten using amend as 2:a468dc9b3633
+ |/ Successors: 3:a468dc9b3633
+ | semi-colon: 3:a468dc9b3633
+ | Fate: rewritten as a468dc9b3633
|
o ea207398892e
@@ -234,10 +238,13 @@
@ d004c8f274b9
|
| x a468dc9b3633
- |/ Obsfate: reworded using amend as 3:d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000)
+ |/ Obsfate: reworded as d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000)
|
+ | x f137d23bb3e1
+ | | Obsfate: pruned by test (at 2009-02-13 23:31 +0000)
+ | |
| x 471f378eab4c
- |/ Obsfate: rewritten using amend as 2:a468dc9b3633 by test (at 2009-02-13 23:31 +0000)
+ |/ Obsfate: rewritten as a468dc9b3633 by test (at 2009-02-13 23:31 +0000)
|
o ea207398892e
@@ -245,9 +252,11 @@
$ hg fatelogjson --hidden
@ d004c8f274b9 []
|
- | x a468dc9b3633 [{"markers": [["a468dc9b36338b14fdb7825f55ce3df4e71517ad", ["d004c8f274b9ec480a47a93c10dac5eee63adb78"], 0, [["ef1", "1"], ["operation", "amend"], ["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"]], [987654321.0, 0], null]], "max_date": [987654321.0, 0], "min_date": [987654321.0, 0], "successors": ["d004c8f274b9ec480a47a93c10dac5eee63adb78"], "users": ["test2"], "verb": "reworded"}]
|/
- | x 471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"], 0, [["ef1", "9"], ["operation", "amend"], ["user", "test"]], [1234567890.0, 0], null]], "max_date": [1234567890.0, 0], "min_date": [1234567890.0, 0], "successors": ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"], "users": ["test"], "verb": "rewritten"}]
+ | 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 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"}]
|/
o ea207398892e []
@@ -326,7 +335,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
@@ -354,7 +363,7 @@
| @ 471597cad322
|/ Successors: 2:337fec4d2edc 3:f257fde29c7a
| semi-colon: 2:337fec4d2edc 3:f257fde29c7a
- | Fate: split using split as 2:337fec4d2edc, 3:f257fde29c7a
+ | Fate: split as 337fec4d2edc, f257fde29c7a
|
o ea207398892e
@@ -364,7 +373,7 @@
o 337fec4d2edc
|
| @ 471597cad322
- |/ Obsfate: split using split as 2:337fec4d2edc, 3:f257fde29c7a
+ |/ Obsfate: split as 337fec4d2edc, f257fde29c7a
|
o ea207398892e
@@ -393,7 +402,7 @@
| x 471597cad322
|/ Successors: 2:337fec4d2edc 3:f257fde29c7a
| semi-colon: 2:337fec4d2edc 3:f257fde29c7a
- | Fate: split using split as 2:337fec4d2edc, 3:f257fde29c7a
+ | Fate: split as 337fec4d2edc, f257fde29c7a
|
o ea207398892e
@@ -403,7 +412,7 @@
o 337fec4d2edc
|
| x 471597cad322
- |/ Obsfate: split using split as 2:337fec4d2edc, 3:f257fde29c7a
+ |/ Obsfate: split as 337fec4d2edc, f257fde29c7a
|
o ea207398892e
@@ -413,7 +422,7 @@
|
o 337fec4d2edc []
|
- | x 471597cad322 [{"markers": [["471597cad322d1f659bb169751be9133dad92ef3", ["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"], 0, [["ef1", "12"], ["operation", "split"], ["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, [["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"], "users": ["test"], "verb": "split"}]
|/
o ea207398892e []
@@ -460,13 +469,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
@@ -490,7 +499,7 @@
| @ 471f378eab4c
|/ Successors: 3:eb5a0daa2192
| semi-colon: 3:eb5a0daa2192
- | Fate: rewritten using fold as 3:eb5a0daa2192
+ | Fate: rewritten as eb5a0daa2192
|
o ea207398892e
@@ -498,7 +507,7 @@
o eb5a0daa2192
|
| @ 471f378eab4c
- |/ Obsfate: rewritten using fold as 3:eb5a0daa2192
+ |/ Obsfate: rewritten as eb5a0daa2192
|
o ea207398892e
@@ -516,12 +525,12 @@
| @ 0dec01379d3b
| | Successors: 3:eb5a0daa2192
| | semi-colon: 3:eb5a0daa2192
- | | Fate: rewritten using fold as 3:eb5a0daa2192
+ | | Fate: rewritten as eb5a0daa2192
| |
| x 471f378eab4c
|/ Successors: 3:eb5a0daa2192
| semi-colon: 3:eb5a0daa2192
- | Fate: rewritten using fold as 3:eb5a0daa2192
+ | Fate: rewritten as eb5a0daa2192
|
o ea207398892e
@@ -529,10 +538,10 @@
o eb5a0daa2192
|
| @ 0dec01379d3b
- | | Obsfate: rewritten using fold as 3:eb5a0daa2192
+ | | Obsfate: rewritten as eb5a0daa2192
| |
| x 471f378eab4c
- |/ Obsfate: rewritten using fold as 3:eb5a0daa2192
+ |/ Obsfate: rewritten as eb5a0daa2192
|
o ea207398892e
@@ -556,12 +565,12 @@
| x 0dec01379d3b
| | Successors: 3:eb5a0daa2192
| | semi-colon: 3:eb5a0daa2192
- | | Fate: rewritten using fold as 3:eb5a0daa2192
+ | | Fate: rewritten as eb5a0daa2192
| |
| x 471f378eab4c
|/ Successors: 3:eb5a0daa2192
| semi-colon: 3:eb5a0daa2192
- | Fate: rewritten using fold as 3:eb5a0daa2192
+ | Fate: rewritten as eb5a0daa2192
|
o ea207398892e
@@ -569,10 +578,10 @@
@ eb5a0daa2192
|
| x 0dec01379d3b
- | | Obsfate: rewritten using fold as 3:eb5a0daa2192
+ | | Obsfate: rewritten as eb5a0daa2192
| |
| x 471f378eab4c
- |/ Obsfate: rewritten using fold as 3:eb5a0daa2192
+ |/ Obsfate: rewritten as eb5a0daa2192
|
o ea207398892e
@@ -580,9 +589,9 @@
$ hg fatelogjson --hidden
@ eb5a0daa2192 []
|
- | x 0dec01379d3b [{"markers": [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["ef1", "13"], ["operation", "fold"], ["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, [["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"], ["operation", "fold"], ["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, [["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], "users": ["test"], "verb": "rewritten"}]
|/
o ea207398892e []
@@ -609,7 +618,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
@@ -622,28 +631,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
@@ -672,8 +681,8 @@
| @ 471f378eab4c
|/ Successors: 2:fdf9bde5129a; 4:019fadeab383
| semi-colon: 2:fdf9bde5129a; 4:019fadeab383
- | Fate: reworded using amend as 2:fdf9bde5129a
- | Fate: reworded using amend as 4:019fadeab383
+ | Fate: reworded as fdf9bde5129a
+ | Fate: reworded as 019fadeab383
|
o ea207398892e
@@ -683,7 +692,7 @@
| o fdf9bde5129a
|/
| @ 471f378eab4c
- |/ Obsfate: reworded using amend as 2:fdf9bde5129a; reworded using amend as 4:019fadeab383
+ |/ Obsfate: reworded as fdf9bde5129a; reworded as 019fadeab383
|
o ea207398892e
@@ -717,7 +726,7 @@
| semi-colon: 1:471f378eab4c
| Successors: 4:019fadeab383
| semi-colon: 4:019fadeab383
- | Fate: reworded using amend as 4:019fadeab383
+ | Fate: reworded as 019fadeab383
|
| @ fdf9bde5129a
|/ Precursors: 1:471f378eab4c
@@ -725,8 +734,8 @@
| x 471f378eab4c
|/ Successors: 2:fdf9bde5129a; 3:65b757b745b9
| semi-colon: 2:fdf9bde5129a; 3:65b757b745b9
- | Fate: reworded using amend as 2:fdf9bde5129a
- | Fate: reworded using amend as 3:65b757b745b9
+ | Fate: reworded as fdf9bde5129a
+ | Fate: reworded as 65b757b745b9
|
o ea207398892e
@@ -734,12 +743,12 @@
o 019fadeab383
|
| x 65b757b745b9
- |/ Obsfate: reworded using amend as 4:019fadeab383
+ |/ Obsfate: reworded as 019fadeab383
|
| @ fdf9bde5129a
|/
| x 471f378eab4c
- |/ Obsfate: reworded using amend as 2:fdf9bde5129a; reworded using amend as 3:65b757b745b9
+ |/ Obsfate: reworded as fdf9bde5129a; reworded as 65b757b745b9
|
o ea207398892e
@@ -747,11 +756,11 @@
$ hg fatelogjson --hidden
o 019fadeab383 []
|
- | x 65b757b745b9 [{"markers": [["65b757b745b935093c87a2bccd877521cccffcbd", ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"], 0, [["ef1", "1"], ["operation", "amend"], ["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"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"], "users": ["test"], "verb": "reworded"}]
|/
| @ fdf9bde5129a []
|/
- | x 471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], 0, [["ef1", "1"], ["operation", "amend"], ["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"], ["operation", "amend"], ["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"]], [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"}]
|/
o ea207398892e []
@@ -779,7 +788,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
@@ -807,19 +816,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
@@ -841,7 +850,7 @@
| @ 471f378eab4c
|/ Successors: 4:eb5a0daa2192
| semi-colon: 4:eb5a0daa2192
- | Fate: rewritten using fold as 4:eb5a0daa2192
+ | Fate: rewritten as eb5a0daa2192
|
o ea207398892e
@@ -849,7 +858,7 @@
o eb5a0daa2192
|
| @ 471f378eab4c
- |/ Obsfate: rewritten using fold as 4:eb5a0daa2192
+ |/ Obsfate: rewritten as eb5a0daa2192
|
o ea207398892e
@@ -864,12 +873,12 @@
| @ 0dec01379d3b
| | Successors: 4:eb5a0daa2192
| | semi-colon: 4:eb5a0daa2192
- | | Fate: rewritten using amend, fold as 4:eb5a0daa2192
+ | | Fate: rewritten as eb5a0daa2192
| |
| x 471f378eab4c
|/ Successors: 4:eb5a0daa2192
| semi-colon: 4:eb5a0daa2192
- | Fate: rewritten using fold as 4:eb5a0daa2192
+ | Fate: rewritten as eb5a0daa2192
|
o ea207398892e
@@ -877,10 +886,10 @@
o eb5a0daa2192
|
| @ 0dec01379d3b
- | | Obsfate: rewritten using amend, fold as 4:eb5a0daa2192
+ | | Obsfate: rewritten as eb5a0daa2192
| |
| x 471f378eab4c
- |/ Obsfate: rewritten using fold as 4:eb5a0daa2192
+ |/ Obsfate: rewritten as eb5a0daa2192
|
o ea207398892e
@@ -896,12 +905,12 @@
| @ b7ea6d14e664
| | Successors: 4:eb5a0daa2192
| | semi-colon: 4:eb5a0daa2192
- | | Fate: rewritten using fold as 4:eb5a0daa2192
+ | | Fate: rewritten as eb5a0daa2192
| |
| x 471f378eab4c
|/ Successors: 4:eb5a0daa2192
| semi-colon: 4:eb5a0daa2192
- | Fate: rewritten using fold as 4:eb5a0daa2192
+ | Fate: rewritten as eb5a0daa2192
|
o ea207398892e
@@ -909,10 +918,10 @@
o eb5a0daa2192
|
| @ b7ea6d14e664
- | | Obsfate: rewritten using fold as 4:eb5a0daa2192
+ | | Obsfate: rewritten as eb5a0daa2192
| |
| x 471f378eab4c
- |/ Obsfate: rewritten using fold as 4:eb5a0daa2192
+ |/ Obsfate: rewritten as eb5a0daa2192
|
o ea207398892e
@@ -933,17 +942,17 @@
| | semi-colon: 2:0dec01379d3b
| | Successors: 4:eb5a0daa2192
| | semi-colon: 4:eb5a0daa2192
- | | Fate: rewritten using fold as 4:eb5a0daa2192
+ | | Fate: rewritten as eb5a0daa2192
| |
| | x 0dec01379d3b
| |/ Successors: 3:b7ea6d14e664
| | semi-colon: 3:b7ea6d14e664
- | | Fate: reworded using amend as 3:b7ea6d14e664
+ | | Fate: reworded as b7ea6d14e664
| |
| x 471f378eab4c
|/ Successors: 4:eb5a0daa2192
| semi-colon: 4:eb5a0daa2192
- | Fate: rewritten using fold as 4:eb5a0daa2192
+ | Fate: rewritten as eb5a0daa2192
|
o ea207398892e
@@ -951,24 +960,24 @@
@ eb5a0daa2192
|
| x b7ea6d14e664
- | | Obsfate: rewritten using fold as 4:eb5a0daa2192
+ | | Obsfate: rewritten as eb5a0daa2192
| |
| | x 0dec01379d3b
- | |/ Obsfate: reworded using amend as 3:b7ea6d14e664
+ | |/ Obsfate: reworded as b7ea6d14e664
| |
| x 471f378eab4c
- |/ Obsfate: rewritten using fold as 4:eb5a0daa2192
+ |/ Obsfate: rewritten as eb5a0daa2192
|
o ea207398892e
$ hg fatelogjson --hidden
@ eb5a0daa2192 []
|
- | x b7ea6d14e664 [{"markers": [["b7ea6d14e664bdc8922221f7992631b50da3fb07", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["ef1", "13"], ["operation", "fold"], ["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, [["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", ["b7ea6d14e664bdc8922221f7992631b50da3fb07"], 0, [["ef1", "1"], ["operation", "amend"], ["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"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["b7ea6d14e664bdc8922221f7992631b50da3fb07"], "users": ["test"], "verb": "reworded"}]
| |/
- | x 471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["ef1", "9"], ["operation", "fold"], ["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, [["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], "users": ["test"], "verb": "rewritten"}]
|/
o ea207398892e []
@@ -1014,13 +1023,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
@@ -1038,7 +1047,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)
@@ -1053,7 +1061,7 @@
| @ changeset: 1:471f378eab4c
|/ user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | obsolete: reworded using amend as 2:7a230b46bf61
+ | obsolete: reworded as 7a230b46bf61
| summary: A0
|
o changeset: 0:ea207398892e
@@ -1071,7 +1079,7 @@
| @ 471f378eab4c
|/ Successors: 2:7a230b46bf61
| semi-colon: 2:7a230b46bf61
- | Fate: reworded using amend as 2:7a230b46bf61
+ | Fate: reworded as 7a230b46bf61
|
o ea207398892e
@@ -1079,7 +1087,7 @@
o 7a230b46bf61
|
| @ 471f378eab4c
- |/ Obsfate: reworded using amend as 2:7a230b46bf61 by test (at 1970-01-01 00:00 +0000)
+ |/ Obsfate: reworded as 7a230b46bf61 by test (at 1970-01-01 00:00 +0000)
|
o ea207398892e
@@ -1102,7 +1110,7 @@
| x 471f378eab4c
|/ Successors: 2:7a230b46bf61
| semi-colon: 2:7a230b46bf61
- | Fate: reworded using amend as 2:7a230b46bf61
+ | Fate: reworded as 7a230b46bf61
|
o ea207398892e
@@ -1110,7 +1118,7 @@
@ 7a230b46bf61
|
| x 471f378eab4c
- |/ Obsfate: reworded using amend as 2:7a230b46bf61 by test (at 1970-01-01 00:00 +0000)
+ |/ Obsfate: reworded as 7a230b46bf61 by test (at 1970-01-01 00:00 +0000)
|
o ea207398892e
@@ -1118,7 +1126,7 @@
$ hg fatelogjson --hidden
@ 7a230b46bf61 []
|
- | x 471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], 0, [["ef1", "1"], ["operation", "amend"], ["user", "test"]], [0.0, 0], null], ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e", ["7a230b46bf61e50b30308c6cfd7bd1269ef54702"], 0, [["ef1", "1"], ["operation", "amend"], ["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"]], [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"}]
|/
o ea207398892e []
@@ -1173,15 +1181,15 @@
| | semi-colon: 1:471f378eab4c
| | Successors: 3:f897c6137566; 1:471f378eab4c
| | semi-colon: 3:f897c6137566; 1:471f378eab4c
- | | Fate: rewritten as 3:f897c6137566
- | | Fate: rewritten as 1:471f378eab4c
+ | | Fate: rewritten as f897c6137566
+ | | Fate: rewritten as 471f378eab4c
| |
| x 471f378eab4c
|/ Precursors: 2:0dec01379d3b
| semi-colon: 2:0dec01379d3b
| Successors: 2:0dec01379d3b
| semi-colon: 2:0dec01379d3b
- | Fate: rewritten as 2:0dec01379d3b
+ | Fate: rewritten as 0dec01379d3b
|
o ea207398892e
@@ -1189,10 +1197,10 @@
o f897c6137566
|
| @ 0dec01379d3b
- | | Obsfate: rewritten as 3:f897c6137566; rewritten as 1:471f378eab4c
+ | | Obsfate: rewritten as f897c6137566; rewritten as 471f378eab4c
| |
| x 471f378eab4c
- |/ Obsfate: rewritten as 2:0dec01379d3b
+ |/ Obsfate: rewritten as 0dec01379d3b
|
o ea207398892e
@@ -1239,15 +1247,15 @@
| | semi-colon: 1:471f378eab4c
| | Successors: 3:f897c6137566; 1:471f378eab4c
| | semi-colon: 3:f897c6137566; 1:471f378eab4c
- | | Fate: rewritten as 3:f897c6137566
- | | Fate: rewritten as 1:471f378eab4c
+ | | Fate: rewritten as f897c6137566
+ | | Fate: rewritten as 471f378eab4c
| |
| x 471f378eab4c
|/ Precursors: 2:0dec01379d3b
| semi-colon: 2:0dec01379d3b
| Successors: 2:0dec01379d3b
| semi-colon: 2:0dec01379d3b
- | Fate: rewritten as 2:0dec01379d3b
+ | Fate: rewritten as 0dec01379d3b
|
@ ea207398892e
@@ -1357,14 +1365,14 @@
$ hg up 6
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg commit --amend -m "Add only B"
- 1 new orphan changesets
+ 1 new unstable changesets
$ hg up 6 --hidden
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
working directory parent is obsolete! (4a004186e638)
(use 'hg evolve' to update to its successor: b18bc8331526)
$ hg commit --amend -m "Add B only"
- 4 new content-divergent changesets
+ 4 new divergent changesets
$ hg log -G
@ changeset: 9:0b997eb7ceee
@@ -1372,34 +1380,34 @@
| parent: 5:dd800401bd8c
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | instability: content-divergent
+ | trouble: divergent
| summary: Add B only
|
| o changeset: 8:b18bc8331526
|/ parent: 5:dd800401bd8c
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | instability: content-divergent
+ | trouble: divergent
| summary: Add only B
|
| o changeset: 7:ba2ed02b0c9a
| | user: test
| | date: Thu Jan 01 00:00:00 1970 +0000
- | | instability: orphan, content-divergent
+ | | trouble: unstable, divergent
| | summary: Add A,B,C
| |
| x changeset: 6:4a004186e638
|/ user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | obsolete: reworded using amend as 8:b18bc8331526
- | obsolete: reworded using amend as 9:0b997eb7ceee
+ | obsolete: reworded as b18bc8331526
+ | obsolete: reworded as 0b997eb7ceee
| summary: Add A,B,C
|
o changeset: 5:dd800401bd8c
| parent: 3:f897c6137566
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | instability: content-divergent
+ | trouble: divergent
| summary: Add A,B,C
|
o changeset: 3:f897c6137566
@@ -1428,8 +1436,8 @@
| x 4a004186e638
|/ Successors: 8:b18bc8331526; 9:0b997eb7ceee
| semi-colon: 8:b18bc8331526; 9:0b997eb7ceee
- | Fate: reworded using amend as 8:b18bc8331526
- | Fate: reworded using amend as 9:0b997eb7ceee
+ | Fate: reworded as b18bc8331526
+ | Fate: reworded as 0b997eb7ceee
|
o dd800401bd8c
|
@@ -1445,7 +1453,7 @@
| o ba2ed02b0c9a
| |
| x 4a004186e638
- |/ Obsfate: reworded using amend as 8:b18bc8331526; reworded using amend as 9:0b997eb7ceee
+ |/ Obsfate: reworded as b18bc8331526; reworded as 0b997eb7ceee
|
o dd800401bd8c
|
@@ -1468,8 +1476,8 @@
| semi-colon: 4:9bd10a0775e4
| Successors: 8:b18bc8331526; 9:0b997eb7ceee
| semi-colon: 8:b18bc8331526; 9:0b997eb7ceee
- | Fate: reworded using amend as 8:b18bc8331526
- | Fate: reworded using amend as 9:0b997eb7ceee
+ | Fate: reworded as b18bc8331526
+ | Fate: reworded as 0b997eb7ceee
|
o dd800401bd8c
| Precursors: 4:9bd10a0775e4
@@ -1477,7 +1485,7 @@
| x 9bd10a0775e4
|/ Successors: 5:dd800401bd8c 6:4a004186e638 7:ba2ed02b0c9a
| semi-colon: 5:dd800401bd8c 6:4a004186e638 7:ba2ed02b0c9a
- | Fate: split as 5:dd800401bd8c, 6:4a004186e638, 7:ba2ed02b0c9a
+ | Fate: split as 4a004186e638, ba2ed02b0c9a, dd800401bd8c
|
o f897c6137566
| Precursors: 2:0dec01379d3b
@@ -1487,15 +1495,15 @@
| | semi-colon: 1:471f378eab4c
| | Successors: 3:f897c6137566; 1:471f378eab4c
| | semi-colon: 3:f897c6137566; 1:471f378eab4c
- | | Fate: rewritten as 3:f897c6137566
- | | Fate: rewritten as 1:471f378eab4c
+ | | Fate: rewritten as f897c6137566
+ | | Fate: rewritten as 471f378eab4c
| |
| x 471f378eab4c
|/ Precursors: 2:0dec01379d3b
| semi-colon: 2:0dec01379d3b
| Successors: 2:0dec01379d3b
| semi-colon: 2:0dec01379d3b
- | Fate: rewritten as 2:0dec01379d3b
+ | Fate: rewritten as 0dec01379d3b
|
o ea207398892e
@@ -1507,20 +1515,20 @@
| o ba2ed02b0c9a
| |
| x 4a004186e638
- |/ Obsfate: reworded using amend as 8:b18bc8331526; reworded using amend as 9:0b997eb7ceee
+ |/ Obsfate: reworded as b18bc8331526; reworded as 0b997eb7ceee
|
o dd800401bd8c
|
| x 9bd10a0775e4
- |/ Obsfate: split as 5:dd800401bd8c, 6:4a004186e638, 7:ba2ed02b0c9a
+ |/ Obsfate: split as 4a004186e638, ba2ed02b0c9a, dd800401bd8c
|
o f897c6137566
|
| x 0dec01379d3b
- | | Obsfate: rewritten as 3:f897c6137566; rewritten as 1:471f378eab4c
+ | | Obsfate: rewritten as f897c6137566; rewritten as 471f378eab4c
| |
| x 471f378eab4c
- |/ Obsfate: rewritten as 2:0dec01379d3b
+ |/ Obsfate: rewritten as 0dec01379d3b
|
o ea207398892e
@@ -1546,8 +1554,8 @@
| @ 9bd10a0775e4
|/ Successors: 5:dd800401bd8c 9:0b997eb7ceee 10:eceed8f98ffc; 5:dd800401bd8c 8:b18bc8331526 10:eceed8f98ffc
| semi-colon: 5:dd800401bd8c 9:0b997eb7ceee 10:eceed8f98ffc; 5:dd800401bd8c 8:b18bc8331526 10:eceed8f98ffc
- | Fate: split using amend, rebase as 5:dd800401bd8c, 9:0b997eb7ceee, 10:eceed8f98ffc
- | Fate: split using amend, rebase as 5:dd800401bd8c, 8:b18bc8331526, 10:eceed8f98ffc
+ | Fate: split as 0b997eb7ceee, dd800401bd8c, eceed8f98ffc
+ | Fate: split as b18bc8331526, dd800401bd8c, eceed8f98ffc
|
o f897c6137566
|
@@ -1563,7 +1571,7 @@
o dd800401bd8c
|
| @ 9bd10a0775e4
- |/ Obsfate: split using amend, rebase as 5:dd800401bd8c, 9:0b997eb7ceee, 10:eceed8f98ffc; split using amend, rebase as 5:dd800401bd8c, 8:b18bc8331526, 10:eceed8f98ffc
+ |/ Obsfate: split as 0b997eb7ceee, dd800401bd8c, eceed8f98ffc; split as b18bc8331526, dd800401bd8c, eceed8f98ffc
|
o f897c6137566
|
@@ -1593,13 +1601,13 @@
(use 'hg evolve' to update to its parent successor)
$ hg tlog
@ 471f378eab4c
- | Fate: pruned using prune
+ | Fate: pruned
|
o ea207398892e
$ hg fatelog -v
@ 471f378eab4c
- | Obsfate: pruned using prune by test (at 1970-01-01 00:00 +0000)
+ | Obsfate: pruned by test (at 1970-01-01 00:00 +0000)
|
o ea207398892e