# HG changeset patch
# User Anton Shestakov <av6@dwimlabs.net>
# Date 1729859499 -14400
# Node ID 10b384b4aeae389f135d3c04fd92c7fb370d10c9
# Parent  79926fbe71524b8e8bb4fe34d59540858a5213ce# Parent  e14ae43aed888ff0e8ab108a551383387edac320
test-compat: merge mercurial-5.9 into mercurial-5.8

diff -r e14ae43aed88 -r 10b384b4aeae tests/test-evolve.t
--- a/tests/test-evolve.t	Fri Oct 25 16:09:37 2024 +0400
+++ b/tests/test-evolve.t	Fri Oct 25 16:31:39 2024 +0400
@@ -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 e14ae43aed88 -r 10b384b4aeae tests/test-namespaces-precheck.t
--- a/tests/test-namespaces-precheck.t	Fri Oct 25 16:09:37 2024 +0400
+++ b/tests/test-namespaces-precheck.t	Fri Oct 25 16:31:39 2024 +0400
@@ -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]