--- a/mercurial/dirstate.py	Thu May 26 02:35:44 2016 +0000
+++ b/mercurial/dirstate.py	Wed May 25 16:09:07 2016 -0700
@@ -582,6 +582,8 @@
             del self._map[f]
             if f in self._nonnormalset:
                 self._nonnormalset.remove(f)
+            if f in self._copymap:
+                del self._copymap[f]
 
     def _discoverpath(self, path, normed, ignoremissing, exists, storemap):
         if exists is None: