D1339: dirstate: don't remove normallookup files from nonnormalset

mbthomas (Mark Thomas) phabricator at mercurial-scm.org
Fri Nov 10 18:03:54 EST 2017


This revision was automatically updated to reflect the committed changes.
Closed by commit rHG1664dc7ccd8a: dirstate: don't remove normallookup files from nonnormalset (authored by mbthomas, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D1339?vs=3339&id=3413

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

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
@@ -458,8 +458,6 @@
                     return
         self._addpath(f, 'n', 0, -1, -1)
         self._map.copymap.pop(f, None)
-        if f in self._map.nonnormalset:
-            self._map.nonnormalset.remove(f)
 
     def otherparent(self, f):
         '''Mark as coming from the other parent, always dirty.'''



To: mbthomas, #hg-reviewers, durin42
Cc: durin42, indygreg, mercurial-devel


More information about the Mercurial-devel mailing list