diff tests/test-prune.t @ 4514:ef1c322c389d mercurial-4.5

test-compat: merge mercurial-4.6 into mercurial-4.5
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Thu, 11 Apr 2019 22:42:14 +0200
parents dc247e648f43 0f2305921e4d
children f54bb6eaf5e6 3810ca63398f
line wrap: on
line diff
--- a/tests/test-prune.t	Thu Apr 11 22:42:13 2019 +0200
+++ b/tests/test-prune.t	Thu Apr 11 22:42:14 2019 +0200
@@ -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