[Updated] D11174: revert: use `set_possibly_dirty` instead of `normal_lookup`
marmoute (Pierre-Yves David)
phabricator at mercurial-scm.org
Tue Jul 20 20:40:53 UTC 2021
Closed by commit rHGdc610e325302: revert: use `set_possibly_dirty` instead of `normallookup` (authored by marmoute).
This revision was automatically updated to reflect the committed changes.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D11174?vs=29519&id=29675
CHANGES SINCE LAST ACTION
https://phab.mercurial-scm.org/D11174/new/
REVISION DETAIL
https://phab.mercurial-scm.org/D11174
AFFECTED FILES
mercurial/cmdutil.py
CHANGE DETAILS
diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py
--- a/mercurial/cmdutil.py
+++ b/mercurial/cmdutil.py
@@ -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]:
To: marmoute, #hg-reviewers, Alphare, pulkit
Cc: mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-patches/attachments/20210720/4443dda4/attachment-0002.html>
More information about the Mercurial-patches
mailing list