Mercurial > public > mercurial-scm > hg-stable

diff mercurial/localrepo.py @ 6685:76021ec849c8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with crew-stable
author Patrick Mezard <pmezard@gmail.com>
date Sun, 15 Jun 2008 13:05:39 +0200
parents 3ef6adad4e43 deda205a00e1
children fec6bc978843
line wrap: on
line diff
--- 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