diff -r 37825a85d3b0 -r ff97e793ed36 mercurial/upgrade_utils/engine.py
--- a/mercurial/upgrade_utils/engine.py	Thu Jul 15 17:24:09 2021 +0200
+++ b/mercurial/upgrade_utils/engine.py	Thu Jul 08 12:18:21 2021 +0200
@@ -643,6 +643,7 @@
     srcrepo.dirstate._use_dirstate_v2 = new == b'v2'
     srcrepo.dirstate._map._use_dirstate_v2 = srcrepo.dirstate._use_dirstate_v2
     srcrepo.dirstate._dirty = True
+    srcrepo.vfs.unlink(b'dirstate')
     srcrepo.dirstate.write(None)
 
     scmutil.writereporequirements(srcrepo, upgrade_op.new_requirements)