[Updated] D11431: dirstate: replace the use of _normallookup in `setparents`
marmoute (Pierre-Yves David)
phabricator at mercurial-scm.org
Mon Sep 20 14:07:51 UTC 2021
Closed by commit rHG625b84c1abdd: dirstate: replace the use of _normallookup in `setparents` (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/D11431?vs=30269&id=30313
CHANGES SINCE LAST ACTION
https://phab.mercurial-scm.org/D11431/new/
REVISION DETAIL
https://phab.mercurial-scm.org/D11431
AFFECTED FILES
mercurial/dirstate.py
CHANGE DETAILS
diff --git a/mercurial/dirstate.py b/mercurial/dirstate.py
--- a/mercurial/dirstate.py
+++ b/mercurial/dirstate.py
@@ -401,7 +401,12 @@
source = self._map.copymap.get(f)
if source:
copies[f] = source
- self._normallookup(f)
+ self._map.reset_state(
+ f,
+ wc_tracked=True,
+ p1_tracked=True,
+ possibly_dirty=True,
+ )
# Also fix up otherparent markers
elif s.from_p2:
source = self._map.copymap.get(f)
To: marmoute, #hg-reviewers, Alphare
Cc: mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-patches/attachments/20210920/973c0098/attachment-0002.html>
More information about the Mercurial-patches
mailing list