Mercurial > public > mercurial-scm > hg

diff mercurial/mergestate.py @ 47691:33beeb32f73a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dirstate: replace `update_parent_file_data` with simpler `update_parent` call This make the dirstate API simpler. Differential Revision: https://phab.mercurial-scm.org/D11133
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Fri, 16 Jul 2021 22:30:11 +0200
parents 8b16ccc71001
children 8e2e8d0a9a56
line wrap: on
line diff
--- 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, []):