--- a/tests/test-evolve-templates.t Mon Apr 23 12:11:10 2018 +0200
+++ b/tests/test-evolve-templates.t Mon Apr 23 12:23:00 2018 +0200
@@ -35,24 +35,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
@@ -69,28 +75,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
@@ -100,7 +106,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
@@ -113,7 +119,7 @@
o d004c8f274b9
|
| @ 471f378eab4c
- |/ Obsfate: rewritten using amend as 3:d004c8f274b9
+ |/ Obsfate: rewritten as d004c8f274b9
|
o ea207398892e
@@ -122,7 +128,7 @@
o d004c8f274b9
|
| @ 471f378eab4c
- |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test, test2
+ |/ Obsfate: rewritten as d004c8f274b9 by test, test2
|
o ea207398892e
@@ -130,7 +136,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
@@ -161,12 +167,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
@@ -174,27 +180,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
@@ -207,19 +208,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
@@ -233,10 +237,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
@@ -315,7 +322,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
@@ -343,7 +350,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
@@ -353,7 +360,7 @@
o 337fec4d2edc
|
| @ 471597cad322
- |/ Obsfate: split using split as 2:337fec4d2edc, 3:f257fde29c7a
+ |/ Obsfate: split as 337fec4d2edc, f257fde29c7a
|
o ea207398892e
@@ -382,7 +389,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
@@ -392,7 +399,7 @@
o 337fec4d2edc
|
| x 471597cad322
- |/ Obsfate: split using split as 2:337fec4d2edc, 3:f257fde29c7a
+ |/ Obsfate: split as 337fec4d2edc, f257fde29c7a
|
o ea207398892e
@@ -439,13 +446,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
@@ -469,7 +476,7 @@
| @ 471f378eab4c
|/ Successors: 3:eb5a0daa2192
| semi-colon: 3:eb5a0daa2192
- | Fate: rewritten using fold as 3:eb5a0daa2192
+ | Fate: rewritten as eb5a0daa2192
|
o ea207398892e
@@ -477,7 +484,7 @@
o eb5a0daa2192
|
| @ 471f378eab4c
- |/ Obsfate: rewritten using fold as 3:eb5a0daa2192
+ |/ Obsfate: rewritten as eb5a0daa2192
|
o ea207398892e
@@ -495,12 +502,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
@@ -508,10 +515,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
@@ -535,12 +542,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
@@ -548,10 +555,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
@@ -578,7 +585,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
@@ -591,28 +598,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
@@ -641,8 +648,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
@@ -652,7 +659,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
@@ -686,7 +693,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
@@ -694,8 +701,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
@@ -703,12 +710,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
@@ -736,7 +743,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
@@ -764,19 +771,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
@@ -798,7 +805,7 @@
| @ 471f378eab4c
|/ Successors: 4:eb5a0daa2192
| semi-colon: 4:eb5a0daa2192
- | Fate: rewritten using fold as 4:eb5a0daa2192
+ | Fate: rewritten as eb5a0daa2192
|
o ea207398892e
@@ -806,7 +813,7 @@
o eb5a0daa2192
|
| @ 471f378eab4c
- |/ Obsfate: rewritten using fold as 4:eb5a0daa2192
+ |/ Obsfate: rewritten as eb5a0daa2192
|
o ea207398892e
@@ -821,12 +828,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
@@ -834,10 +841,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
@@ -853,12 +860,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
@@ -866,10 +873,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
@@ -890,17 +897,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
@@ -908,13 +915,13 @@
@ 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
@@ -960,13 +967,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
@@ -984,7 +991,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)
@@ -999,7 +1005,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
@@ -1017,7 +1023,7 @@
| @ 471f378eab4c
|/ Successors: 2:7a230b46bf61
| semi-colon: 2:7a230b46bf61
- | Fate: reworded using amend as 2:7a230b46bf61
+ | Fate: reworded as 7a230b46bf61
|
o ea207398892e
@@ -1025,7 +1031,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
@@ -1048,7 +1054,7 @@
| x 471f378eab4c
|/ Successors: 2:7a230b46bf61
| semi-colon: 2:7a230b46bf61
- | Fate: reworded using amend as 2:7a230b46bf61
+ | Fate: reworded as 7a230b46bf61
|
o ea207398892e
@@ -1056,7 +1062,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
@@ -1111,15 +1117,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
@@ -1127,10 +1133,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
@@ -1177,15 +1183,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
@@ -1295,14 +1301,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
@@ -1310,34 +1316,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
@@ -1366,8 +1372,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
|
@@ -1383,7 +1389,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
|
@@ -1406,8 +1412,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
@@ -1415,7 +1421,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
@@ -1425,15 +1431,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
@@ -1445,20 +1451,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
@@ -1484,8 +1490,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
|
@@ -1501,7 +1507,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
|
@@ -1531,13 +1537,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