# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@octobus.net>
# Date 1626666322 -7200
# Node ID 0e581d7e89b7d63bd93156950599434552cb9b81
# Parent  8e2e8d0a9a56476e6bc813833de2b77d91474927
mergestate: use `update_file` to handle for `ACTION_EXEC`

This is the newer, more semantic API.

Differential Revision: https://phab.mercurial-scm.org/D11169

diff -r 8e2e8d0a9a56 -r 0e581d7e89b7 mercurial/mergestate.py
--- 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, []):