diff -r c5ef535e274e -r 1f369ca9e34c mercurial/context.py
--- a/mercurial/context.py	Wed Feb 15 23:28:20 2023 +0100
+++ b/mercurial/context.py	Wed Feb 15 23:29:04 2023 +0100
@@ -1897,6 +1897,8 @@
                         self._repo.ui.debug(
                             b'skip updating dirstate: identity mismatch\n'
                         )
+                        # throw away anything we have.
+                        dirstate.invalidate()
             except error.LockError:
                 pass
             finally: