diff tests/test-evolve-obshistory-split.t @ 3933:1194c850fe2a mercurial-4.6

test-compat: merge stable into mercurial-4.6
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Fri, 03 Aug 2018 00:19:45 +0200
parents f7afd3a158e3
children f3713d41b85b 522abf1d70b7
line wrap: on
line diff
--- a/tests/test-evolve-obshistory-split.t	Fri Aug 03 00:52:10 2018 +0200
+++ b/tests/test-evolve-obshistory-split.t	Fri Aug 03 00:19:45 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)