changeset 48000:1370d695c258

dirstate: use `reset_state` in `rebuild` instead of `dropfile` As `dirstatemap.dropfile` is on its way out. Differential Revision: https://phab.mercurial-scm.org/D11440
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Wed, 15 Sep 2021 18:40:25 +0200
parents bac82c2ce858
children af84aa1a66f1
files mercurial/dirstate.py
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/dirstate.py	Wed Sep 15 18:38:24 2021 +0200
+++ b/mercurial/dirstate.py	Wed Sep 15 18:40:25 2021 +0200
@@ -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