diff -r af4848f83e68 -r 2fe8d66e3075 mercurial/hg.py
--- a/mercurial/hg.py	Tue Jun 21 17:47:28 2005 -0800
+++ b/mercurial/hg.py	Tue Jun 21 17:50:37 2005 -0800
@@ -706,6 +706,9 @@
             p = self.wjoin(f)
             if os.path.isfile(p):
                 self.ui.warn("%s still exists!\n" % f)
+            elif self.dirstate.state(f) == 'a':
+                self.ui.warn("%s never committed!\n" % f)
+                self.dirstate.forget(f)
             elif f not in self.dirstate:
                 self.ui.warn("%s not tracked!\n" % f)
             else: