--- a/mercurial/localrepo.py	Sat Jun 14 16:01:24 2008 +0200
+++ b/mercurial/localrepo.py	Sun Jun 15 13:05:39 2008 +0200
@@ -695,7 +695,7 @@
 
         meta = {}
         cp = self.dirstate.copied(fn)
-        if cp:
+        if cp and cp != fn:
             # Mark the new revision of this file as a copy of another
             # file.  This copy data will effectively act as a parent
             # of this new revision.  If this is a merge, the first