diff tests/test-evolve-obshistory-split.t @ 3924:f3713d41b85b mercurial-4.5

test-compat: merge mercurial-4.6 into mercurial-4.5
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Thu, 02 Aug 2018 01:58:44 +0200
parents f7afd3a158e3
children d00f0c369bc7 8bd60e09dfb4
line wrap: on
line diff
--- a/tests/test-evolve-obshistory-split.t	Thu Aug 02 01:57:13 2018 +0200
+++ b/tests/test-evolve-obshistory-split.t	Thu Aug 02 01:58:44 2018 +0200
@@ -199,8 +199,8 @@
          (No patch available, too many successors (2))
   
   $ hg update 471597cad322
-  abort: hidden revision '471597cad322' was split as: 337fec4d2edc, f257fde29c7a!
-  (use --hidden to access hidden revisions)
+  abort: hidden revision '471597cad322'!
+  (use --hidden to access hidden revisions; successors: 337fec4d2edc, f257fde29c7a)
   [255]
   $ hg update --hidden 'min(desc(A0))'
   updating to a hidden changeset 471597cad322