diff -r 0cdd73b0767c -r 30ab5b8ee8ec mercurial/dirstate.py
--- a/mercurial/dirstate.py	Sat Aug 27 20:58:53 2005 -0700
+++ b/mercurial/dirstate.py	Sat Aug 27 22:04:17 2005 -0700
@@ -141,6 +141,8 @@
                 st_size = kw.get('st_size', s.st_size)
                 st_mtime = kw.get('st_mtime', s.st_mtime)
                 self.map[f] = (state, s.st_mode, st_size, st_mtime)
+            if self.copies.has_key(f):
+                del self.copies[f]
 
     def forget(self, files):
         if not files: return