Mercurial > hg-stable
changeset 47726:8e2e8d0a9a56
mergestate: use `update_file` to handle for `ACTION_ADD_MODIFIED`
This is the newer, more semantic API.
Differential Revision: https://phab.mercurial-scm.org/D11168
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Mon, 19 Jul 2021 05:44:57 +0200 |
| parents | 1f3a87a7a9b1 |
| children | 0e581d7e89b7 |
| files | mercurial/mergestate.py |
| diffstat | 1 files changed, 3 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/mergestate.py Mon Jul 19 05:47:54 2021 +0200 +++ b/mercurial/mergestate.py Mon Jul 19 05:44:57 2021 +0200 @@ -768,7 +768,9 @@ # re-add/mark as modified for f, args, msg in actions.get(ACTION_ADD_MODIFIED, []): if branchmerge: - repo.dirstate.normallookup(f) + repo.dirstate.update_file( + f, p1_tracked=True, wc_tracked=True, possibly_dirty=True + ) else: repo.dirstate.update_file(f, p1_tracked=False, wc_tracked=True)