Mercurial > evolve

changeset 4171:e541acefbaa5 mercurial-4.6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge stable into mercurial-4.6
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Fri, 12 Oct 2018 15:15:05 +0200
parents 50b8b06be26d (current diff) 8e79671ba1fd (diff)
children 35c21ab64420 2a7f89817540
files tests/test-discovery-obshashrange.t tests/test-evolve-content-divergence.t tests/test-evolve-phase-divergence.t tests/test-evolve-templates.t tests/test-evolve.t tests/test-obsolete.t tests/test-topic.t
diffstat 20 files changed, 87 insertions(+), 93 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-discovery-obshashrange.t	Fri Oct 12 15:37:22 2018 +0200
+++ b/tests/test-discovery-obshashrange.t	Fri Oct 12 15:15:05 2018 +0200
@@ -230,6 +230,7 @@
   remote: adding manifests
   remote: adding file changes
   remote: added 1 changesets with 1 changes to 1 files (+1 heads)
+  remote: 1 new obsolescence markers
   bundle2-input-bundle: no-transaction
   bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported
   bundle2-input-part: "reply:obsmarkers" (params: 0 advisory) supported
@@ -237,7 +238,6 @@
   preparing listkeys for "phases"
   sending listkeys command
   received listkey for "phases": 58 bytes
-  remote: 1 new obsolescence markers
   $ hg -R ../server blackbox
   * @0000000000000000000000000000000000000000 (*)> -R server serve --stdio (glob)
   1970/01/01 00:00:00 * @0000000000000000000000000000000000000000 (*)> updated evo-ext-firstmerge in *.???? seconds (1r) (glob)
--- a/tests/test-evolve-abort-contentdiv.t	Fri Oct 12 15:37:22 2018 +0200
+++ b/tests/test-evolve-abort-contentdiv.t	Fri Oct 12 15:15:05 2018 +0200
@@ -45,9 +45,9 @@
   $ hg amend
 
   $ hg up c41c793e0ef1 --hidden
+  updating to a hidden changeset c41c793e0ef1
+  (hidden revision 'c41c793e0ef1' was rewritten as: e49523854bc8)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  updated to hidden changeset c41c793e0ef1
-  (hidden revision 'c41c793e0ef1' was rewritten as: e49523854bc8)
   working directory parent is obsolete! (c41c793e0ef1)
   (use 'hg evolve' to update to its successor: e49523854bc8)
 
@@ -269,9 +269,9 @@
   $ hg amend
 
   $ hg up --hidden c41c793e0ef1
+  updating to a hidden changeset c41c793e0ef1
+  (hidden revision 'c41c793e0ef1' was rewritten as: 69bdd23a9b0d)
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  updated to hidden changeset c41c793e0ef1
-  (hidden revision 'c41c793e0ef1' was rewritten as: 69bdd23a9b0d)
   working directory parent is obsolete! (c41c793e0ef1)
   (use 'hg evolve' to update to its successor: 69bdd23a9b0d)
   $ echo bar > d
--- a/tests/test-evolve-content-divergence.t	Fri Oct 12 15:37:22 2018 +0200
+++ b/tests/test-evolve-content-divergence.t	Fri Oct 12 15:15:05 2018 +0200
@@ -38,9 +38,9 @@
   changed branch on 1 changesets
 
   $ hg up c41c793e0ef1 --hidden
+  updating to a hidden changeset c41c793e0ef1
+  (hidden revision 'c41c793e0ef1' was rewritten as: 9e5dffcb3d48)
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  updated to hidden changeset c41c793e0ef1
-  (hidden revision 'c41c793e0ef1' was rewritten as: 9e5dffcb3d48)
   working directory parent is obsolete! (c41c793e0ef1)
   (use 'hg evolve' to update to its successor: 9e5dffcb3d48)
   $ echo bar > d
@@ -146,9 +146,9 @@
   $ hg amend -m "foo to d"
 
   $ hg up a9d6fd6b5e40 --hidden
+  updating to a hidden changeset a9d6fd6b5e40
+  (hidden revision 'a9d6fd6b5e40' was rewritten as: b10b07a394f1)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  updated to hidden changeset a9d6fd6b5e40
-  (hidden revision 'a9d6fd6b5e40' was rewritten as: b10b07a394f1)
   working directory parent is obsolete! (a9d6fd6b5e40)
   (use 'hg evolve' to update to its successor: b10b07a394f1)
   $ echo babar > d
@@ -206,9 +206,9 @@
   $ hg amend -m "bar to d, expect beers"
 
   $ hg up 11175423b5dc --hidden
+  updating to a hidden changeset 11175423b5dc
+  (hidden revision '11175423b5dc' was rewritten as: 27f0463f169a)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  updated to hidden changeset 11175423b5dc
-  (hidden revision '11175423b5dc' was rewritten as: 27f0463f169a)
   working directory parent is obsolete! (11175423b5dc)
   (use 'hg evolve' to update to its successor: 27f0463f169a)
   $ echo wat > d
@@ -409,9 +409,9 @@
   $ hg amend -m "added foo to x"
 
   $ hg up 71a392c714b5 --hidden
+  updating to a hidden changeset 71a392c714b5
+  (hidden revision '71a392c714b5' was rewritten as: 1e1a50385a7d)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  updated to hidden changeset 71a392c714b5
-  (hidden revision '71a392c714b5' was rewritten as: 1e1a50385a7d)
   working directory parent is obsolete! (71a392c714b5)
   (use 'hg evolve' to update to its successor: 1e1a50385a7d)
   $ hg rebase -r . -d 4ae4427ee9f8 --config experimental.evolution.allowdivergence=True
@@ -494,9 +494,9 @@
   $ hg amend
 
   $ hg up fc6ad2bac162 --hidden
+  updating to a hidden changeset fc6ad2bac162
+  (hidden revision 'fc6ad2bac162' was rewritten as: 2a9f6ccbdeba)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  updated to hidden changeset fc6ad2bac162
-  (hidden revision 'fc6ad2bac162' was rewritten as: 2a9f6ccbdeba)
   working directory parent is obsolete! (fc6ad2bac162)
   (use 'hg evolve' to update to its successor: 2a9f6ccbdeba)
   $ hg rebase -r . -d b006cf317e0e --config experimental.evolution.allowdivergence=True
@@ -629,9 +629,9 @@
   $ hg amend
 
   $ hg up daf1de08f3b0 --hidden
+  updating to a hidden changeset daf1de08f3b0
+  (hidden revision 'daf1de08f3b0' was rewritten as: 3f7a1f693080)
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
-  updated to hidden changeset daf1de08f3b0
-  (hidden revision 'daf1de08f3b0' was rewritten as: 3f7a1f693080)
   working directory parent is obsolete! (daf1de08f3b0)
   (use 'hg evolve' to update to its successor: 3f7a1f693080)
   $ hg rebase -r . -d 7bbcf24ddecf --config experimental.evolution.allowdivergence=True
--- a/tests/test-evolve-obshistory-amend-then-fold.t	Fri Oct 12 15:37:22 2018 +0200
+++ b/tests/test-evolve-obshistory-amend-then-fold.t	Fri Oct 12 15:15:05 2018 +0200
@@ -231,15 +231,15 @@
   (use --hidden to access hidden revisions)
   [255]
   $ hg update --hidden 'desc(A0)'
+  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 update --hidden 0dec01379d3b
+  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 update 0dec01379d3b
--- a/tests/test-evolve-obshistory-amend.t	Fri Oct 12 15:37:22 2018 +0200
+++ b/tests/test-evolve-obshistory-amend.t	Fri Oct 12 15:15:05 2018 +0200
@@ -199,9 +199,9 @@
   (use --hidden to access hidden revisions)
   [255]
   $ hg update --hidden "desc(A0)"
+  updating to a hidden changeset 471f378eab4c
+  (hidden revision '471f378eab4c' was rewritten as: 4ae3a4151de9)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  updated to hidden changeset 471f378eab4c
-  (hidden revision '471f378eab4c' was rewritten as: 4ae3a4151de9)
   working directory parent is obsolete! (471f378eab4c)
   (use 'hg evolve' to update to its successor: 4ae3a4151de9)
 
--- a/tests/test-evolve-obshistory-content-divergent.t	Fri Oct 12 15:37:22 2018 +0200
+++ b/tests/test-evolve-obshistory-content-divergent.t	Fri Oct 12 15:15:05 2018 +0200
@@ -37,9 +37,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"
@@ -337,8 +337,8 @@
   (use --hidden to access hidden revisions)
   [255]
   $ hg update --hidden 'desc(A0)'
+  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)
--- a/tests/test-evolve-obshistory-fold.t	Fri Oct 12 15:37:22 2018 +0200
+++ b/tests/test-evolve-obshistory-fold.t	Fri Oct 12 15:15:05 2018 +0200
@@ -229,9 +229,9 @@
   (use --hidden to access hidden revisions)
   [255]
   $ hg update --hidden 'desc(A0)'
+  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 update 0dec01379d3b
@@ -239,9 +239,9 @@
   (use --hidden to access hidden revisions)
   [255]
   $ hg update --hidden 'desc(B0)'
+  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)
 
--- a/tests/test-evolve-obshistory-lots-of-splits.t	Fri Oct 12 15:37:22 2018 +0200
+++ b/tests/test-evolve-obshistory-lots-of-splits.t	Fri Oct 12 15:15:05 2018 +0200
@@ -281,8 +281,8 @@
   (use --hidden to access hidden revisions)
   [255]
   $ hg update --hidden 'min(desc(A0))'
+  updating to a hidden changeset de7290d8b885
+  (hidden revision 'de7290d8b885' was split as: 337fec4d2edc, f257fde29c7a and 2 more)
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  updated to hidden changeset de7290d8b885
-  (hidden revision 'de7290d8b885' was split as: 337fec4d2edc, f257fde29c7a and 2 more)
   working directory parent is obsolete! (de7290d8b885)
   (use 'hg evolve' to update to its tipmost successor: 337fec4d2edc, f257fde29c7a and 2 more)
--- a/tests/test-evolve-obshistory-phase-divergent.t	Fri Oct 12 15:37:22 2018 +0200
+++ b/tests/test-evolve-obshistory-phase-divergent.t	Fri Oct 12 15:15:05 2018 +0200
@@ -37,9 +37,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 phase -p .
--- a/tests/test-evolve-obshistory-prune.t	Fri Oct 12 15:37:22 2018 +0200
+++ b/tests/test-evolve-obshistory-prune.t	Fri Oct 12 15:15:05 2018 +0200
@@ -106,9 +106,9 @@
   (use --hidden to access hidden revisions)
   [255]
   $ hg up --hidden -r 'desc(B0)'
+  updating to a hidden changeset 0dec01379d3b
+  (hidden revision '0dec01379d3b' is pruned)
   1 files updated, 0 files merged, 0 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)
 
--- a/tests/test-evolve-obshistory-split.t	Fri Oct 12 15:37:22 2018 +0200
+++ b/tests/test-evolve-obshistory-split.t	Fri Oct 12 15:15:05 2018 +0200
@@ -203,9 +203,9 @@
   (use --hidden to access hidden revisions)
   [255]
   $ hg update --hidden 'min(desc(A0))'
+  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)
 
--- a/tests/test-evolve-phase-divergence.t	Fri Oct 12 15:37:22 2018 +0200
+++ b/tests/test-evolve-phase-divergence.t	Fri Oct 12 15:15:05 2018 +0200
@@ -115,7 +115,6 @@
   searching for changes
   no changes found
   1 new phase-divergent changesets
-  1 local changesets published
 
   $ hg glog
   @  2:98bb3a6cfe1a tweak a
@@ -284,7 +283,6 @@
   searching for changes
   no changes found
   1 new phase-divergent changesets
-  1 local changesets published
 
   $ hg glog
   @  4:d47f2b37ed82 added bar to foo
@@ -415,7 +413,6 @@
   adding file changes
   added 1 changesets with 1 changes to 1 files
   new changesets b756eb10ea73
-  1 local changesets published
   (run 'hg update' to get a working copy)
 
   $ hg push ../public
@@ -437,7 +434,6 @@
   searching for changes
   no changes found
   1 new phase-divergent changesets
-  1 local changesets published
 
   $ hg glog
   @  7:2c3560aedead foo to bar
@@ -567,7 +563,6 @@
   searching for changes
   no changes found
   1 new phase-divergent changesets
-  1 local changesets published
 
   $ hg obslog -r .
   @  334e300d6db5 (10) added x to x
--- a/tests/test-evolve-stop-contentdiv.t	Fri Oct 12 15:37:22 2018 +0200
+++ b/tests/test-evolve-stop-contentdiv.t	Fri Oct 12 15:15:05 2018 +0200
@@ -42,9 +42,9 @@
   $ hg amend
 
   $ hg up c41c793e0ef1 --hidden
+  updating to a hidden changeset c41c793e0ef1
+  (hidden revision 'c41c793e0ef1' was rewritten as: e49523854bc8)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  updated to hidden changeset c41c793e0ef1
-  (hidden revision 'c41c793e0ef1' was rewritten as: e49523854bc8)
   working directory parent is obsolete! (c41c793e0ef1)
   (use 'hg evolve' to update to its successor: e49523854bc8)
 
--- a/tests/test-evolve-templates.t	Fri Oct 12 15:37:22 2018 +0200
+++ b/tests/test-evolve-templates.t	Fri Oct 12 15:15:05 2018 +0200
@@ -63,9 +63,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)
 
@@ -156,9 +156,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)
 
@@ -332,9 +332,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)
 
@@ -463,9 +463,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)
 
@@ -490,9 +490,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)
 
@@ -597,9 +597,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"
@@ -638,9 +638,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)
 
@@ -802,9 +802,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
@@ -827,9 +827,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
@@ -861,9 +861,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
@@ -1120,9 +1120,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
@@ -1486,9 +1486,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=
@@ -1551,9 +1551,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
--- a/tests/test-evolve.t	Fri Oct 12 15:37:22 2018 +0200
+++ b/tests/test-evolve.t	Fri Oct 12 15:15:05 2018 +0200
@@ -1253,18 +1253,18 @@
 Shows "use 'hg evolve' to..." hints iff the evolve command is enabled
 
   $ hg --hidden up 14
+  updating to a hidden changeset 484fb3cfa7f2
+  (hidden revision '484fb3cfa7f2' was rewritten as: 98e171e2f272)
   2 files updated, 0 files merged, 1 files removed, 0 files unresolved
-  updated to hidden changeset 484fb3cfa7f2
-  (hidden revision '484fb3cfa7f2' was rewritten as: 98e171e2f272)
   working directory parent is obsolete! (484fb3cfa7f2)
   $ cat >> $HGRCPATH <<EOF
   > [experimental]
   > evolutioncommands=evolve
   > EOF
   $ hg --hidden up 15
+  updating to a hidden changeset daa1ff1c7fbd
+  (hidden revision 'daa1ff1c7fbd' was rewritten as: 0c049e4e5422)
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
-  updated to hidden changeset daa1ff1c7fbd
-  (hidden revision 'daa1ff1c7fbd' was rewritten as: 0c049e4e5422)
   working directory parent is obsolete! (daa1ff1c7fbd)
   (use 'hg evolve' to update to its successor: 0c049e4e5422)
 
@@ -1572,9 +1572,9 @@
   @  1:ab832e43dd5a added a
   
   $ hg up f7ad41964313 --hidden
+  updating to a hidden changeset f7ad41964313
+  (hidden revision 'f7ad41964313' was rewritten as: ab832e43dd5a)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  updated to hidden changeset f7ad41964313
-  (hidden revision 'f7ad41964313' was rewritten as: ab832e43dd5a)
   working directory parent is obsolete! (f7ad41964313)
   (use 'hg evolve' to update to its successor: ab832e43dd5a)
 
--- a/tests/test-obsolete.t	Fri Oct 12 15:37:22 2018 +0200
+++ b/tests/test-obsolete.t	Fri Oct 12 15:15:05 2018 +0200
@@ -121,7 +121,7 @@
   4
   - 725c380fe99b
   $ hg up --hidden 3 -q
-  updated to hidden changeset 0d3f46688ccc
+  updating to a hidden changeset 0d3f46688ccc
   (hidden revision '0d3f46688ccc' was rewritten as: 725c380fe99b)
   working directory parent is obsolete! (0d3f46688ccc)
 (reported by parents too)
@@ -707,7 +707,7 @@
   
 
   $ hg up --hidden 3 -q
-  updated to hidden changeset 0d3f46688ccc
+  updating to a hidden changeset 0d3f46688ccc
   (hidden revision '0d3f46688ccc' has diverged)
   working directory parent is obsolete! (0d3f46688ccc)
   $ hg evolve
@@ -727,9 +727,9 @@
 Check import reports new unstable changeset:
 
   $ hg up --hidden 2
+  updating to a hidden changeset 4538525df7e2
+  (hidden revision '4538525df7e2' has diverged)
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
-  updated to hidden changeset 4538525df7e2
-  (hidden revision '4538525df7e2' has diverged)
   working directory parent is obsolete! (4538525df7e2)
   (4538525df7e2 has diverged, use 'hg evolve --list --content-divergent' to resolve the issue)
   $ hg export 9468a5f5d8b2 | hg import -
--- a/tests/test-stabilize-result.t	Fri Oct 12 15:37:22 2018 +0200
+++ b/tests/test-stabilize-result.t	Fri Oct 12 15:15:05 2018 +0200
@@ -237,9 +237,9 @@
   $ echo 'babar' >> a
   $ hg amend
   $ hg up --hidden 3932c176bbaa
+  updating to a hidden changeset 3932c176bbaa
+  (hidden revision '3932c176bbaa' was rewritten as: d2f173e25686)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  updated to hidden changeset 3932c176bbaa
-  (hidden revision '3932c176bbaa' was rewritten as: d2f173e25686)
   working directory parent is obsolete! (3932c176bbaa)
   (use 'hg evolve' to update to its successor: d2f173e25686)
   $ mv a a.old
@@ -345,9 +345,9 @@
 -------------------------------------------------
 
   $ hg up --hidden 3932c176bbaa
+  updating to a hidden changeset 3932c176bbaa
+  (hidden revision '3932c176bbaa' was rewritten as: 4d6ed26797bc)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  updated to hidden changeset 3932c176bbaa
-  (hidden revision '3932c176bbaa' was rewritten as: 4d6ed26797bc)
   working directory parent is obsolete! (3932c176bbaa)
   (use 'hg evolve' to update to its successor: 4d6ed26797bc)
   $ echo 'gotta break' >> a
--- a/tests/test-topic.t	Fri Oct 12 15:37:22 2018 +0200
+++ b/tests/test-topic.t	Fri Oct 12 15:15:05 2018 +0200
@@ -599,7 +599,6 @@
   adding file changes
   added 3 changesets with 3 changes to 1 files
   new changesets 7c34953036d6:ae074045b7a7
-  1 local changesets published
   active topic 'query' is now empty
   (run 'hg update' to get a working copy)
   $ hg topics
--- a/tests/test-touch.t	Fri Oct 12 15:37:22 2018 +0200
+++ b/tests/test-touch.t	Fri Oct 12 15:15:05 2018 +0200
@@ -32,9 +32,9 @@
   $ hg add b
   $ hg commit -m ab --amend
   $ hg up --hidden 1
+  updating to a hidden changeset [0-9a-f]{12} (re)
+  (hidden revision '*' was rewritten as: *) (glob)
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
-  updated to hidden changeset * (glob)
-  (hidden revision '*' was rewritten as: *) (glob)
   working directory parent is obsolete! (*) (glob)
   (use 'hg evolve' to update to its successor: *) (glob)
   $ hg log -G
--- a/tests/test-uncommit.t	Fri Oct 12 15:37:22 2018 +0200
+++ b/tests/test-uncommit.t	Fri Oct 12 15:15:05 2018 +0200
@@ -238,10 +238,10 @@
 Test phase is preserved, no local changes
 
   $ hg up -C 3 --hidden
+  updating to a hidden changeset 5eb72dbe0cb4
+  (hidden revision '5eb72dbe0cb4' was rewritten as: e8db4aa611f6)
   8 files updated, 0 files merged, 1 files removed, 0 files unresolved
   (leaving bookmark touncommit-bm)
-  updated to hidden changeset 5eb72dbe0cb4
-  (hidden revision '5eb72dbe0cb4' was rewritten as: e8db4aa611f6)
   working directory parent is obsolete! (5eb72dbe0cb4)
   (use 'hg evolve' to update to its successor: e8db4aa611f6)
   $ hg --config extensions.purge= purge
@@ -287,9 +287,9 @@
 Test --all
 
   $ hg up -C 3 --hidden
+  updating to a hidden changeset 5eb72dbe0cb4
+  (hidden revision '5eb72dbe0cb4' has diverged)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  updated to hidden changeset 5eb72dbe0cb4
-  (hidden revision '5eb72dbe0cb4' has diverged)
   working directory parent is obsolete! (5eb72dbe0cb4)
   (5eb72dbe0cb4 has diverged, use 'hg evolve --list --content-divergent' to resolve the issue)
   $ hg --config extensions.purge= purge