Mercurial Mercurial > hg-stable / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mergestate: use `update_file` to handle for `ACTION_EXEC`
authorPierre-Yves David <pierre-yves.david@octobus.net>
Mon, 19 Jul 2021 05:45:22 +0200
changeset 47727 0e581d7e89b7
parent 47726 8e2e8d0a9a56
child 47728 4d1ae9cba551
mergestate: use `update_file` to handle for `ACTION_EXEC` This is the newer, more semantic API. Differential Revision: https://phab.mercurial-scm.org/D11169
mercurial/mergestate.py file | annotate | diff | comparison | revisions 
--- a/mercurial/mergestate.py	Mon Jul 19 05:44:57 2021 +0200
+++ b/mercurial/mergestate.py	Mon Jul 19 05:45:22 2021 +0200
@@ -776,7 +776,9 @@
 
     # exec change
     for f, args, msg in actions.get(ACTION_EXEC, []):
-        repo.dirstate.normallookup(f)
+        repo.dirstate.update_file(
+            f, p1_tracked=True, wc_tracked=True, possibly_dirty=True
+        )
 
     # keep
     for f, args, msg in actions.get(ACTION_KEEP, []):
hg-stable