diff tests/test-prune.t @ 4226:94214f8291eb mercurial-4.5

test-compat: merge mercurial-4.6 into mercurial-4.5
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Fri, 09 Nov 2018 20:18:58 +0100
parents dc247e648f43
children 9c025ec4af88 a2fdbece7ce1 ef1c322c389d
line wrap: on
line diff
--- a/tests/test-prune.t	Fri Nov 09 20:18:57 2018 +0100
+++ b/tests/test-prune.t	Fri Nov 09 20:18:58 2018 +0100
@@ -312,8 +312,8 @@
   bookmark 'todelete' deleted
   1 changesets pruned
   $ hg id -ir dcbb326fdec2
-  abort: hidden revision 'dcbb326fdec2' is pruned!
-  (use --hidden to access hidden revisions)
+  abort: hidden revision 'dcbb326fdec2'!
+  (use --hidden to access hidden revisions; pruned)
   [255]
   $ hg id -ir d62d843c9a01
   d62d843c9a01
@@ -346,8 +346,8 @@
   3 changesets pruned
   $ hg tag --remove --local c
   $ hg id -ir 6:2702dd0c91e7
-  abort: hidden revision '6' is pruned!
-  (use --hidden to access hidden revisions)
+  abort: hidden revision '6'!
+  (use --hidden to access hidden revisions; pruned)
   [255]
 
   $ hg debugobsstorestat