# HG changeset patch
# User Anton Shestakov <av6@dwimlabs.net>
# Date 1712849619 10800
# Node ID 477a1e8b77d8ca4590ae87e6daf0f5d7310f54d5
# Parent  92bde649e5aab1db7c40049010bf470afb5860e4# Parent  bdf99d434b06636f475ccdbc2eda58fd9c48b769
test-compat: merge mercurial-5.9 into mercurial-5.8

diff -r bdf99d434b06 -r 477a1e8b77d8 tests/test-evolve.t
--- a/tests/test-evolve.t	Thu Apr 11 12:05:06 2024 -0300
+++ b/tests/test-evolve.t	Thu Apr 11 12:33:39 2024 -0300
@@ -563,7 +563,6 @@
   checking manifests
   crosschecking files in changesets and manifests
   checking files
-  checking dirstate (?)
   checked 3 changesets with 3 changes to 3 files
   $ hg --config extensions.mq= strip 'extinct()'
   abort: empty revision set
@@ -576,7 +575,6 @@
   checking manifests
   crosschecking files in changesets and manifests
   checking files
-  checking dirstate (?)
   checked 2 changesets with 2 changes to 2 files
   $ cd ..
 
diff -r bdf99d434b06 -r 477a1e8b77d8 tests/test-namespaces-precheck.t
--- a/tests/test-namespaces-precheck.t	Thu Apr 11 12:05:06 2024 -0300
+++ b/tests/test-namespaces-precheck.t	Thu Apr 11 12:33:39 2024 -0300
@@ -21,7 +21,7 @@
 Make sure general checks in precheck() happen before topic namespaces checks
 
   $ hg prune null
-  abort: cannot prune the null revision
+  abort: cannot prune null changeset
   (no changeset checked out)
   [10]