diff -r 7658221da551 -r cc8c09855d19 mercurial/dirstate.py
--- a/mercurial/dirstate.py	Thu May 26 10:46:34 2011 +0200
+++ b/mercurial/dirstate.py	Thu May 26 17:15:35 2011 -0500
@@ -365,14 +365,11 @@
         if f in self._copymap:
             del self._copymap[f]
 
-    def forget(self, f):
-        '''Forget a file.'''
+    def drop(self, f):
+        '''Drop a file from the dirstate'''
         self._dirty = True
-        try:
-            self._droppath(f)
-            del self._map[f]
-        except KeyError:
-            self._ui.warn(_("not in dirstate: %s\n") % f)
+        self._droppath(f)
+        del self._map[f]
 
     def _normalize(self, path, isknown):
         normed = os.path.normcase(path)