diff tests/test-evolve-templates.t @ 3411:e1f3e43a50a4 stable

branching: backed out test output changes from core-1905aac253f0

This backs out evolve-ae6fddf39933

--- a/tests/test-evolve-templates.t	Mon Jan 15 19:42:44 2018 +0100
+++ b/tests/test-evolve-templates.t	Mon Jan 15 19:52:00 2018 +0100
@@ -632,7 +632,7 @@
   |  instability: content-divergent
   |  summary:     A2
   |
-  | *  changeset:   2:fdf9bde5129a
+  | o  changeset:   2:fdf9bde5129a
   |/   parent:      0:ea207398892e
   |    user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
@@ -663,10 +663,10 @@
 
 Precursors template should show current revision as it is the working copy
   $ hg tlog
-  *  019fadeab383
+  o  019fadeab383
   |    Precursors: 1:471f378eab4c
   |    semi-colon: 1:471f378eab4c
-  | *  fdf9bde5129a
+  | o  fdf9bde5129a
   |/     Precursors: 1:471f378eab4c
   |      semi-colon: 1:471f378eab4c
   | @  471f378eab4c
@@ -678,9 +678,9 @@
   o  ea207398892e
   
   $ hg fatelog
-  *  019fadeab383
+  o  019fadeab383
   |
-  | *  fdf9bde5129a
+  | o  fdf9bde5129a
   |/
   | @  471f378eab4c
   |/     Obsfate: reworded using amend as 2:fdf9bde5129a; reworded using amend as 4:019fadeab383
@@ -693,7 +693,7 @@
 Precursors template should not show precursors as it's not displayed in the
 log
   $ hg tlog
-  *  019fadeab383
+  o  019fadeab383
   |
   | @  fdf9bde5129a
   |/
@@ -701,7 +701,7 @@
   
 
   $ hg fatelog
-  *  019fadeab383
+  o  019fadeab383
   |
   | @  fdf9bde5129a
   |/
@@ -709,7 +709,7 @@
   
 Precursors template should a precursor as we force its display with --hidden
   $ hg tlog --hidden
-  *  019fadeab383
+  o  019fadeab383
   |    Precursors: 3:65b757b745b9
   |    semi-colon: 3:65b757b745b9
   | x  65b757b745b9
@@ -731,7 +731,7 @@
   o  ea207398892e
   
   $ hg fatelog --hidden
-  *  019fadeab383
+  o  019fadeab383
   |
   | x  65b757b745b9
   |/     Obsfate: reworded using amend as 4:019fadeab383
@@ -745,7 +745,7 @@
   
 
   $ hg fatelogjson --hidden
-  *  019fadeab383 []
+  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"}]
   |/
@@ -1376,14 +1376,14 @@
   |  instability: content-divergent
   |  summary:     Add B only
   |
-  | *  changeset:   8:b18bc8331526
+  | o  changeset:   8:b18bc8331526
   |/   parent:      5:dd800401bd8c
   |    user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
   |    instability: content-divergent
   |    summary:     Add only B
   |
-  | *  changeset:   7:ba2ed02b0c9a
+  | o  changeset:   7:ba2ed02b0c9a
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   | |  instability: orphan, content-divergent
@@ -1396,7 +1396,7 @@
   |    obsolete:    reworded using amend as 9:0b997eb7ceee
   |    summary:     Add A,B,C
   |
-  *  changeset:   5:dd800401bd8c
+  o  changeset:   5:dd800401bd8c
   |  parent:      3:f897c6137566
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
@@ -1421,10 +1421,10 @@
   @  0b997eb7ceee
   |    Precursors: 6:4a004186e638
   |    semi-colon: 6:4a004186e638
-  | *  b18bc8331526
+  | o  b18bc8331526
   |/     Precursors: 6:4a004186e638
   |      semi-colon: 6:4a004186e638
-  | *  ba2ed02b0c9a
+  | o  ba2ed02b0c9a
   | |
   | x  4a004186e638
   |/     Successors: 8:b18bc8331526; 9:0b997eb7ceee
@@ -1432,7 +1432,7 @@
   |      Fate: reworded using amend as 8:b18bc8331526
   |      Fate: reworded using amend as 9:0b997eb7ceee
   |
-  *  dd800401bd8c
+  o  dd800401bd8c
   |
   o  f897c6137566
   |
@@ -1441,14 +1441,14 @@
   $ hg fatelog
   @  0b997eb7ceee
   |
-  | *  b18bc8331526
+  | o  b18bc8331526
   |/
-  | *  ba2ed02b0c9a
+  | o  ba2ed02b0c9a
   | |
   | x  4a004186e638
   |/     Obsfate: reworded using amend as 8:b18bc8331526; reworded using amend as 9:0b997eb7ceee
   |
-  *  dd800401bd8c
+  o  dd800401bd8c
   |
   o  f897c6137566
   |
@@ -1458,10 +1458,10 @@
   @  0b997eb7ceee
   |    Precursors: 6:4a004186e638
   |    semi-colon: 6:4a004186e638
-  | *  b18bc8331526
+  | o  b18bc8331526
   |/     Precursors: 6:4a004186e638
   |      semi-colon: 6:4a004186e638
-  | *  ba2ed02b0c9a
+  | o  ba2ed02b0c9a
   | |    Precursors: 4:9bd10a0775e4
   | |    semi-colon: 4:9bd10a0775e4
   | x  4a004186e638
@@ -1472,7 +1472,7 @@
   |      Fate: reworded using amend as 8:b18bc8331526
   |      Fate: reworded using amend as 9:0b997eb7ceee
   |
-  *  dd800401bd8c
+  o  dd800401bd8c
   |    Precursors: 4:9bd10a0775e4
   |    semi-colon: 4:9bd10a0775e4
   | x  9bd10a0775e4
@@ -1503,14 +1503,14 @@
   $ hg fatelog --hidden
   @  0b997eb7ceee
   |
-  | *  b18bc8331526
+  | o  b18bc8331526
   |/
-  | *  ba2ed02b0c9a
+  | o  ba2ed02b0c9a
   | |
   | x  4a004186e638
   |/     Obsfate: reworded using amend as 8:b18bc8331526; reworded using amend as 9:0b997eb7ceee
   |
-  *  dd800401bd8c
+  o  dd800401bd8c
   |
   | x  9bd10a0775e4
   |/     Obsfate: split as 5:dd800401bd8c, 6:4a004186e638, 7:ba2ed02b0c9a
@@ -1533,16 +1533,16 @@
   $ hg rebase -r 7 -d 8 --config extensions.rebase=
   rebasing 7:ba2ed02b0c9a "Add A,B,C"
   $ hg tlog
-  *  eceed8f98ffc
+  o  eceed8f98ffc
   |    Precursors: 4:9bd10a0775e4
   |    semi-colon: 4:9bd10a0775e4
-  | *  0b997eb7ceee
+  | o  0b997eb7ceee
   | |    Precursors: 4:9bd10a0775e4
   | |    semi-colon: 4:9bd10a0775e4
-  * |  b18bc8331526
+  o |  b18bc8331526
   |/     Precursors: 4:9bd10a0775e4
   |      semi-colon: 4:9bd10a0775e4
-  *  dd800401bd8c
+  o  dd800401bd8c
   |    Precursors: 4:9bd10a0775e4
   |    semi-colon: 4:9bd10a0775e4
   | @  9bd10a0775e4
@@ -1556,13 +1556,13 @@
   o  ea207398892e
   
   $ hg fatelog
-  *  eceed8f98ffc
+  o  eceed8f98ffc
   |
-  | *  0b997eb7ceee
+  | o  0b997eb7ceee
   | |
-  * |  b18bc8331526
+  o |  b18bc8331526
   |/
-  *  dd800401bd8c
+  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