diff tests/test-evolve-obshistory-fold.t @ 6065:c0921b5277a0 mercurial-5.6

test-compat: merge mercurial-5.7 into mercurial-5.6 # no-check-commit
author Anton Shestakov <av6@dwimlabs.net>
date Tue, 12 Oct 2021 11:32:36 +0300
parents 08c30eef85d3 1ac08311ae15
children 55e9987b8384 171d13d8f0ce
line wrap: on
line diff
--- a/tests/test-evolve-obshistory-fold.t	Tue Oct 12 11:15:44 2021 +0300
+++ b/tests/test-evolve-obshistory-fold.t	Tue Oct 12 11:32:36 2021 +0300
@@ -289,7 +289,7 @@
       }
   ]
   $ hg update 471f378eab4c
-  abort: hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192
+  abort: hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192!
   (use --hidden to access hidden revisions)
   [255]
   $ hg update --hidden 'desc(A0)'
@@ -299,7 +299,7 @@
   working directory parent is obsolete! (471f378eab4c)
   (use 'hg evolve' to update to its successor: eb5a0daa2192)
   $ hg update 0dec01379d3b
-  abort: hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192
+  abort: hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192!
   (use --hidden to access hidden revisions)
   [255]
   $ hg update --hidden 'desc(B0)'