diff -r 474279be5add -r 41453d55b481 mercurial/dirstate.py
--- a/mercurial/dirstate.py	Tue Nov 01 12:25:54 2011 -0700
+++ b/mercurial/dirstate.py	Tue Nov 01 15:19:37 2011 -0500
@@ -370,9 +370,10 @@
 
     def drop(self, f):
         '''Drop a file from the dirstate'''
-        self._dirty = True
-        self._droppath(f)
-        del self._map[f]
+        if f in self._map:
+            self._dirty = True
+            self._droppath(f)
+            del self._map[f]
 
     def _normalize(self, path, isknown):
         normed = os.path.normcase(path)