Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dirstate: use `reset_state` in `rebuild` instead of `dropfile`
authorPierre-Yves David <pierre-yves.david@octobus.net>
Wed, 15 Sep 2021 18:40:25 +0200
changeset 48000 1370d695c258
parent 47999 bac82c2ce858
child 48001 af84aa1a66f1
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
mercurial/dirstate.py file | annotate | diff | comparison | revisions 
--- 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
Mercurial