diff -r 0dc9ced02a3b -r 5437a0254590 mercurial/context.py
--- a/mercurial/context.py	Wed Sep 29 14:56:23 2021 +0200
+++ b/mercurial/context.py	Wed Sep 29 14:57:54 2021 +0200
@@ -1555,7 +1555,7 @@
                 yield f
 
     def __contains__(self, key):
-        return self._repo.dirstate[key] not in b"?r"
+        return self._repo.dirstate.get_entry(key).tracked
 
     def hex(self):
         return self._repo.nodeconstants.wdirhex