--- a/mercurial/subrepoutil.py	Thu Mar 03 17:39:20 2022 -0800
+++ b/mercurial/subrepoutil.py	Thu Mar 03 18:28:30 2022 -0800
@@ -190,7 +190,7 @@
         repo.ui.debug(b"  subrepo %s: %s %s\n" % (s, msg, r))
 
     promptssrc = filemerge.partextras(labels)
-    for s, l in sorted(pycompat.iteritems(s1)):
+    for s, l in sorted(s1.items()):
         a = sa.get(s, nullstate)
         ld = l  # local state with possible dirty flag for compares
         if wctx.sub(s).dirty():