--- a/mercurial/dirstatemap.py	Sat Jul 03 04:07:21 2021 +0200
+++ b/mercurial/dirstatemap.py	Sat Jul 03 04:26:28 2021 +0200
@@ -173,7 +173,7 @@
                 # backup the previous state
                 if entry.merged:  # merge
                     size = NONNORMAL
-                elif entry[0] == b'n' and entry[2] == FROM_P2:  # other parent
+                elif entry[0] == b'n' and entry.from_p2:
                     size = FROM_P2
                     self.otherparentset.add(f)
         if size == 0: