diff tests/test-obsolete.t @ 6065:c0921b5277a0 mercurial-5.6

test-compat: merge mercurial-5.7 into mercurial-5.6

# no-check-commit

--- a/tests/test-obsolete.t	Tue Oct 12 11:15:44 2021 +0300
+++ b/tests/test-obsolete.t	Tue Oct 12 11:32:36 2021 +0300
@@ -170,7 +170,7 @@
   $ hg init ../other-new
   $ hg phase --draft 'secret() - extinct()' # until we fix exclusion
   abort: empty revision set
-  [10]
+  [255]
   $ hg push ../other-new
   pushing to ../other-new
   searching for changes
@@ -309,7 +309,7 @@
 ..  $ hg push ../other-old
 ..  pushing to ../other-old
 ..  searching for changes
-..  abort: push includes an unstable changeset: 909a0fb57e5d
+..  abort: push includes an unstable changeset: 909a0fb57e5d!
 ..  (use 'hg evolve' to get a stable history or --force to ignore warnings)
 ..  [255]
 ..  $ hg push -f ../other-old