--- a/mercurial/mergestate.py	Fri Jul 16 15:07:16 2021 +0200
+++ b/mercurial/mergestate.py	Fri Jul 16 22:30:11 2021 +0200
@@ -801,7 +801,12 @@
             )
         else:
             parentfiledata = getfiledata[f] if getfiledata else None
-            repo.dirstate.update_parent_file_data(f, parentfiledata)
+            repo.dirstate.update_file(
+                f,
+                p1_tracked=True,
+                wc_tracked=True,
+                parentfiledata=parentfiledata,
+            )
 
     # merge
     for f, args, msg in actions.get(ACTION_MERGE, []):