diff -Nru mercurial-6.2.2/debian/changelog mercurial-6.2.2/debian/changelog
--- mercurial-6.2.2/debian/changelog	2022-09-02 12:08:12.000000000 +0000
+++ mercurial-6.2.2/debian/changelog	2022-09-10 08:02:05.000000000 +0000
@@ -1,3 +1,10 @@
+mercurial (6.2.2-1+rpi1) bookworm-staging; urgency=medium
+
+  [changes brought forward from 6.1.1-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 21 Apr 2022 22:42:37 +0000]
+  * Disable testsuite.
+
+ -- Raspbian forward porter <root@raspbian.org>  Sat, 10 Sep 2022 08:02:05 +0000
+
 mercurial (6.2.2-1) sid; urgency=medium
 
   * New upstream bugfix release
diff -Nru mercurial-6.2.2/debian/rules mercurial-6.2.2/debian/rules
--- mercurial-6.2.2/debian/rules	2022-02-03 09:30:19.000000000 +0000
+++ mercurial-6.2.2/debian/rules	2022-09-10 08:02:05.000000000 +0000
@@ -33,7 +33,7 @@
 ARCH_IS_SPARC := $(if $(subst sparc,,$(DEB_HOST_ARCH)),,T)
 
 override_dh_auto_test:
-ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+ifeq (testsuitedisabled,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 # test-pull-pull-corruption tries to execute two hg commands at the
 # same time to test for corruption.  It does so by running an hg
 # command in the background, sleeping one second and running the