--- a/tests/test-evolve-obshistory.t	Fri Apr 13 09:26:28 2018 -0700
+++ b/tests/test-evolve-obshistory.t	Sun Apr 15 23:24:03 2018 +0200
@@ -201,8 +201,8 @@
       }
   ]
   $ hg update 471f378eab4c
-  abort: hidden revision '471f378eab4c'!
-  (use --hidden to access hidden revisions; successor: 4ae3a4151de9)
+  abort: hidden revision '471f378eab4c' was rewritten as: 4ae3a4151de9!
+  (use --hidden to access hidden revisions)
   [255]
   $ hg update --hidden "desc(A0)"
   updating to a hidden changeset 471f378eab4c
@@ -304,8 +304,8 @@
   $ hg up 1
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg up 0dec01379d3b
-  abort: hidden revision '0dec01379d3b'!
-  (use --hidden to access hidden revisions; pruned)
+  abort: hidden revision '0dec01379d3b' is pruned!
+  (use --hidden to access hidden revisions)
   [255]
   $ hg up --hidden -r 'desc(B0)'
   updating to a hidden changeset 0dec01379d3b
@@ -503,8 +503,8 @@
          (No patch available, too many successors (2))
   
   $ hg update 471597cad322
-  abort: hidden revision '471597cad322'!
-  (use --hidden to access hidden revisions; successors: 337fec4d2edc, f257fde29c7a)
+  abort: hidden revision '471597cad322' was split as: 337fec4d2edc, f257fde29c7a!
+  (use --hidden to access hidden revisions)
   [255]
   $ hg update --hidden 'min(desc(A0))'
   updating to a hidden changeset 471597cad322
@@ -784,8 +784,8 @@
          (No patch available, too many successors (4))
   
   $ hg update de7290d8b885
-  abort: hidden revision 'de7290d8b885'!
-  (use --hidden to access hidden revisions; successors: 337fec4d2edc, f257fde29c7a and 2 more)
+  abort: hidden revision 'de7290d8b885' was split as: 337fec4d2edc, f257fde29c7a and 2 more!
+  (use --hidden to access hidden revisions)
   [255]
   $ hg update --hidden 'min(desc(A0))'
   updating to a hidden changeset de7290d8b885
@@ -1009,8 +1009,8 @@
       }
   ]
   $ hg update 471f378eab4c
-  abort: hidden revision '471f378eab4c'!
-  (use --hidden to access hidden revisions; successor: eb5a0daa2192)
+  abort: hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192!
+  (use --hidden to access hidden revisions)
   [255]
   $ hg update --hidden 'desc(A0)'
   updating to a hidden changeset 471f378eab4c
@@ -1019,8 +1019,8 @@
   working directory parent is obsolete! (471f378eab4c)
   (use 'hg evolve' to update to its successor: eb5a0daa2192)
   $ hg update 0dec01379d3b
-  abort: hidden revision '0dec01379d3b'!
-  (use --hidden to access hidden revisions; successor: eb5a0daa2192)
+  abort: hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192!
+  (use --hidden to access hidden revisions)
   [255]
   $ hg update --hidden 'desc(B0)'
   updating to a hidden changeset 0dec01379d3b
@@ -1356,8 +1356,8 @@
       }
   ]
   $ hg update 471f378eab4c
-  abort: hidden revision '471f378eab4c'!
-  (use --hidden to access hidden revisions; diverged)
+  abort: hidden revision '471f378eab4c' has diverged!
+  (use --hidden to access hidden revisions)
   [255]
   $ hg update --hidden 'desc(A0)'
   updating to a hidden changeset 471f378eab4c
@@ -1587,8 +1587,8 @@
       }
   ]
   $ hg update 471f378eab4c
-  abort: hidden revision '471f378eab4c'!
-  (use --hidden to access hidden revisions; successor: eb5a0daa2192)
+  abort: hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192!
+  (use --hidden to access hidden revisions)
   [255]
   $ hg update --hidden 'desc(A0)'
   updating to a hidden changeset 471f378eab4c

--- a/tests/test-fold.t	Fri Apr 13 09:26:28 2018 -0700
+++ b/tests/test-fold.t	Sun Apr 15 23:24:03 2018 +0200
@@ -112,8 +112,8 @@
 (test inherited from test-evolve.t)
 
   $ hg fold --from 6 # want to run hg fold 6
-  abort: hidden revision '6'!
-  (use --hidden to access hidden revisions; successor: 198b5c405d01)
+  abort: hidden revision '6' was rewritten as: 198b5c405d01!
+  (use --hidden to access hidden revisions)
   [255]
 
   $ hg log -G

--- a/tests/test-prune.t	Fri Apr 13 09:26:28 2018 -0700
+++ b/tests/test-prune.t	Sun Apr 15 23:24:03 2018 +0200
@@ -306,8 +306,8 @@
   bookmark 'todelete' deleted
   1 changesets pruned
   $ hg id -ir dcbb326fdec2
-  abort: hidden revision 'dcbb326fdec2'!
-  (use --hidden to access hidden revisions; pruned)
+  abort: hidden revision 'dcbb326fdec2' is pruned!
+  (use --hidden to access hidden revisions)
   [255]
   $ hg id -ir d62d843c9a01
   d62d843c9a01
@@ -340,8 +340,8 @@
   3 changesets pruned
   $ hg tag --remove --local c
   $ hg id -ir 6:2702dd0c91e7
-  abort: hidden revision '6'!
-  (use --hidden to access hidden revisions; pruned)
+  abort: hidden revision '6' is pruned!
+  (use --hidden to access hidden revisions)
   [255]
 
   $ hg debugobsstorestat

--- a/tests/test-userguide.t	Fri Apr 13 09:26:28 2018 -0700
+++ b/tests/test-userguide.t	Sun Apr 15 23:24:03 2018 +0200
@@ -38,8 +38,8 @@
   $ echo 'tweak feature Y' >> file1.c
   $ hg commit --amend -u alice -d '2 0' -m 'implement feature Y'
   $ hg shortlog -q -r fe0ecd3bd2a4
-  abort: hidden revision 'fe0ecd3bd2a4'!
-  (use --hidden to access hidden revisions; successor: 934359450037)
+  abort: hidden revision 'fe0ecd3bd2a4' was rewritten as: 934359450037!
+  (use --hidden to access hidden revisions)
   [255]
   $ hg --hidden shortlog -G
   @  2:934359450037  draft  implement feature Y