--- a/tests/test-evolve-templates.t Sat Feb 29 15:17:31 2020 +0700
+++ b/tests/test-evolve-templates.t Sat Feb 29 15:18:00 2020 +0700
@@ -65,9 +65,9 @@
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
- updated to hidden changeset 471f378eab4c
- (hidden revision '471f378eab4c' was rewritten as: d004c8f274b9)
working directory parent is obsolete! (471f378eab4c)
(use 'hg evolve' to update to its successor: d004c8f274b9)
@@ -158,9 +158,9 @@
$ 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
- updated to hidden changeset a468dc9b3633
- (hidden revision 'a468dc9b3633' was rewritten as: d004c8f274b9)
working directory parent is obsolete! (a468dc9b3633)
(use 'hg evolve' to update to its successor: d004c8f274b9)
@@ -334,9 +334,9 @@
---------------
$ 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
- updated to hidden changeset 471597cad322
- (hidden revision '471597cad322' was split as: 337fec4d2edc, f257fde29c7a)
working directory parent is obsolete! (471597cad322)
(use 'hg evolve' to update to its tipmost successor: 337fec4d2edc, f257fde29c7a)
@@ -465,9 +465,9 @@
---------------
$ 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
- updated to hidden changeset 471f378eab4c
- (hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192)
working directory parent is obsolete! (471f378eab4c)
(use 'hg evolve' to update to its successor: eb5a0daa2192)
@@ -492,9 +492,9 @@
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
- updated to hidden changeset 0dec01379d3b
- (hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192)
working directory parent is obsolete! (0dec01379d3b)
(use 'hg evolve' to update to its successor: eb5a0daa2192)
@@ -599,9 +599,9 @@
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
- updated to hidden changeset 471f378eab4c
- (hidden revision '471f378eab4c' was rewritten as: fdf9bde5129a)
working directory parent is obsolete! (471f378eab4c)
(use 'hg evolve' to update to its successor: fdf9bde5129a)
$ hg amend -m "A2"
@@ -640,9 +640,9 @@
---------------
$ 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
- updated to hidden changeset 471f378eab4c
- (hidden revision '471f378eab4c' has diverged)
working directory parent is obsolete! (471f378eab4c)
(471f378eab4c has diverged, use 'hg evolve --list --content-divergent' to resolve the issue)
@@ -804,9 +804,9 @@
---------------
$ 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
- updated to hidden changeset 471f378eab4c
- (hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192)
working directory parent is obsolete! (471f378eab4c)
(use 'hg evolve' to update to its successor: eb5a0daa2192)
$ hg tlog
@@ -829,9 +829,9 @@
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
- updated to hidden changeset 0dec01379d3b
- (hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192)
working directory parent is obsolete! (0dec01379d3b)
(use 'hg evolve' to update to its successor: eb5a0daa2192)
$ hg tlog
@@ -863,9 +863,9 @@
$ 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
- updated to hidden changeset b7ea6d14e664
- (hidden revision 'b7ea6d14e664' was rewritten as: eb5a0daa2192)
working directory parent is obsolete! (b7ea6d14e664)
(use 'hg evolve' to update to its successor: eb5a0daa2192)
$ hg tlog
@@ -1122,9 +1122,9 @@
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
- updated to hidden changeset 0dec01379d3b
- (hidden revision '0dec01379d3b' is pruned)
working directory parent is obsolete! (0dec01379d3b)
(use 'hg evolve' to update to its parent successor)
$ hg tlog
@@ -1488,9 +1488,9 @@
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
- updated to hidden changeset 9bd10a0775e4
- (hidden revision '9bd10a0775e4' has diverged)
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=
@@ -1553,9 +1553,9 @@
------------
$ 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
- updated to hidden changeset 471f378eab4c
- (hidden revision '471f378eab4c' is pruned)
working directory parent is obsolete! (471f378eab4c)
(use 'hg evolve' to update to its parent successor)
$ hg tlog