diff -r ecede5263adb -r 1664dc7ccd8a mercurial/dirstate.py
--- a/mercurial/dirstate.py	Wed Nov 08 09:23:53 2017 -0800
+++ b/mercurial/dirstate.py	Wed Nov 08 09:27:14 2017 -0800
@@ -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.'''