Mercurial > hg
changeset 47732:dc610e325302
revert: use `set_possibly_dirty` instead of `normallookup`
This is the newer, more semantic API.
Differential Revision: https://phab.mercurial-scm.org/D11174
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Mon, 19 Jul 2021 03:52:54 +0200 |
parents | 485ae37a7ec5 |
children | 4b7eb01db10b |
files | mercurial/cmdutil.py |
diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/cmdutil.py Mon Jul 19 14:02:58 2021 +0200 +++ b/mercurial/cmdutil.py Mon Jul 19 03:52:54 2021 +0200 @@ -3610,7 +3610,7 @@ # to report the file as clean. We have to use normallookup for # merges to avoid losing information about merged/dirty files. if p2 != repo.nullid: - normal = repo.dirstate.normallookup + normal = repo.dirstate.set_tracked else: normal = repo.dirstate.set_clean @@ -3703,7 +3703,7 @@ checkout(f) repo.dirstate.set_tracked(f) - normal = repo.dirstate.normallookup + normal = repo.dirstate.set_tracked if node == parent and p2 == repo.nullid: normal = repo.dirstate.set_clean for f in actions[b'undelete'][0]: