[Updated] D11439: dirstate: use `reset_state` to drop file in `update_file_p1`

[marmoute (Pierre-Yves David)]

Closed by commit rHGbac82c2ce858: dirstate: use `reset_state` to drop file in `update_file_p1` (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/D11439?vs=30277&id=30321

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D11439/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D11439

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
@@ -556,7 +556,8 @@
             possibly_dirty = True
         elif not (p1_tracked or wc_tracked):
             # the file is no longer relevant to anyone
-            if self._map.dropfile(filename):
+            if self._map.get(filename) is not None:
+                self._map.reset_state(filename)
                 self._dirty = True
                 self._updatedfiles.add(filename)
         elif (not p1_tracked) and wc_tracked:



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/e8c41146/attachment-0002.html>