mercurial/dirstatemap.py

--- a/mercurial/dirstatemap.py	Fri Jul 16 17:10:52 2021 +0200
+++ b/mercurial/dirstatemap.py	Fri Jul 16 17:14:56 2021 +0200
@@ -295,8 +295,7 @@
                 self.addfile(filename, from_p2=True)
                 return
         elif not p1_tracked and p2_tracked and wc_tracked:
-            self.addfile(filename, from_p2=True, possibly_dirty=possibly_dirty)
-            return
+            clean_p2 = True
         elif possibly_dirty:
             pass
         elif wc_tracked: