--- a/tests/test-evolve-templates.t Wed Mar 21 16:03:46 2018 +0100
+++ b/tests/test-evolve-templates.t Wed Mar 21 16:06:17 2018 +0100
@@ -64,8 +64,6 @@
Check templates
---------------
$ hg up 'desc(A0)' --hidden
- updating to a hidden changeset 471f378eab4c
- (hidden revision '471f378eab4c' was rewritten as: d004c8f274b9)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
working directory parent is obsolete! (471f378eab4c)
(use 'hg evolve' to update to its successor: d004c8f274b9)
@@ -157,8 +155,6 @@
$ hg up 'desc(A1)' --hidden
- updating to a hidden changeset a468dc9b3633
- (hidden revision 'a468dc9b3633' was rewritten as: d004c8f274b9)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
working directory parent is obsolete! (a468dc9b3633)
(use 'hg evolve' to update to its successor: d004c8f274b9)
@@ -343,8 +339,6 @@
---------------
$ hg up 'obsolete()' --hidden
- updating to a hidden changeset 471597cad322
- (hidden revision '471597cad322' was split as: 337fec4d2edc, f257fde29c7a)
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
working directory parent is obsolete! (471597cad322)
(use 'hg evolve' to update to its tipmost successor: 337fec4d2edc, f257fde29c7a)
@@ -484,8 +478,6 @@
---------------
$ hg up 'desc(A0)' --hidden
- updating to a hidden changeset 471f378eab4c
- (hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192)
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
working directory parent is obsolete! (471f378eab4c)
(use 'hg evolve' to update to its successor: eb5a0daa2192)
@@ -511,8 +503,6 @@
o ea207398892e
$ hg up 'desc(B0)' --hidden
- updating to a hidden changeset 0dec01379d3b
- (hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
working directory parent is obsolete! (0dec01379d3b)
(use 'hg evolve' to update to its successor: eb5a0daa2192)
@@ -628,8 +618,6 @@
summary: ROOT
$ hg update --hidden 'desc(A0)'
- updating to a hidden changeset 471f378eab4c
- (hidden revision '471f378eab4c' was rewritten as: fdf9bde5129a)
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
working directory parent is obsolete! (471f378eab4c)
(use 'hg evolve' to update to its successor: fdf9bde5129a)
@@ -644,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
@@ -669,18 +657,16 @@
---------------
$ hg up 'desc(A0)' --hidden
- updating to a hidden changeset 471f378eab4c
- (hidden revision '471f378eab4c' has diverged)
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
working directory parent is obsolete! (471f378eab4c)
(471f378eab4c has diverged, use 'hg evolve --list --content-divergent' to resolve the issue)
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
@@ -692,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
@@ -707,7 +693,7 @@
Precursors template should not show precursors as it's not displayed in the
log
$ hg tlog
- * 019fadeab383
+ o 019fadeab383
|
| @ fdf9bde5129a
|/
@@ -715,7 +701,7 @@
$ hg fatelog
- * 019fadeab383
+ o 019fadeab383
|
| @ fdf9bde5129a
|/
@@ -723,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
@@ -745,7 +731,7 @@
o ea207398892e
$ hg fatelog --hidden
- * 019fadeab383
+ o 019fadeab383
|
| x 65b757b745b9
|/ Obsfate: reworded using amend as 4:019fadeab383
@@ -759,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"}]
|/
@@ -845,8 +831,6 @@
---------------
$ hg up 'desc(A0)' --hidden
- updating to a hidden changeset 471f378eab4c
- (hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192)
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
working directory parent is obsolete! (471f378eab4c)
(use 'hg evolve' to update to its successor: eb5a0daa2192)
@@ -870,8 +854,6 @@
o ea207398892e
$ hg up 'desc(B0)' --hidden
- updating to a hidden changeset 0dec01379d3b
- (hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
working directory parent is obsolete! (0dec01379d3b)
(use 'hg evolve' to update to its successor: eb5a0daa2192)
@@ -904,8 +886,6 @@
$ hg up 'desc(B1)' --hidden
- updating to a hidden changeset b7ea6d14e664
- (hidden revision 'b7ea6d14e664' was rewritten as: eb5a0daa2192)
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
working directory parent is obsolete! (b7ea6d14e664)
(use 'hg evolve' to update to its successor: eb5a0daa2192)
@@ -1163,7 +1143,6 @@
$ hg debugobsolete `getid "desc(A0)"` `getid "desc(B0)"`
obsoleted 1 changesets
- 1 new orphan changesets
$ hg debugobsolete `getid "desc(B0)"` `getid "desc(C0)"`
obsoleted 1 changesets
$ hg debugobsolete `getid "desc(B0)"` `getid "desc(A0)"`
@@ -1182,8 +1161,6 @@
o ea207398892e
$ hg up -r "desc(B0)" --hidden
- updating to a hidden changeset 0dec01379d3b
- (hidden revision '0dec01379d3b' is pruned)
2 files updated, 0 files merged, 1 files removed, 0 files unresolved
working directory parent is obsolete! (0dec01379d3b)
(use 'hg evolve' to update to its parent successor)
@@ -1398,14 +1375,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
@@ -1418,7 +1395,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
@@ -1443,10 +1420,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
@@ -1454,7 +1431,7 @@
| Fate: reworded using amend as 8:b18bc8331526
| Fate: reworded using amend as 9:0b997eb7ceee
|
- * dd800401bd8c
+ o dd800401bd8c
|
o f897c6137566
|
@@ -1463,14 +1440,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
|
@@ -1480,10 +1457,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
@@ -1494,7 +1471,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
@@ -1525,14 +1502,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
@@ -1548,24 +1525,22 @@
o ea207398892e
$ hg up --hidden 4
- updating to a hidden changeset 9bd10a0775e4
- (hidden revision '9bd10a0775e4' has diverged)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
working directory parent is obsolete! (9bd10a0775e4)
(9bd10a0775e4 has diverged, use 'hg evolve --list --content-divergent' to resolve the issue)
$ 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
@@ -1579,13 +1554,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
@@ -1613,8 +1588,6 @@
------------
$ hg up "desc(A0)" --hidden
- updating to a hidden changeset 471f378eab4c
- (hidden revision '471f378eab4c' is pruned)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
working directory parent is obsolete! (471f378eab4c)
(use 'hg evolve' to update to its parent successor)