[Updated] D11440: dirstate: use `reset_state` in `rebuild` instead of `dropfile`

[marmoute (Pierre-Yves David)]

Closed by commit rHG1370d695c258: dirstate: use `reset_state` in `rebuild` instead of `dropfile` (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/D11440?vs=30278&id=30322

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

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

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
@@ -814,8 +814,8 @@
                 )
             self._updatedfiles.add(f)
         for f in to_drop:
-            if self._map.dropfile(f):
-                self._updatedfiles.add(f)
+            self._map.reset_state(f)
+            self._updatedfiles.add(f)
 
         self._dirty = True
 



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