Mercurial > hg

diff mercurial/localrepo.py @ 6680:deda205a00e1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Ignore dummy copies in dirstate and localrepo.filecommit()
author Patrick Mezard <pmezard@gmail.com>
date Sun, 15 Jun 2008 13:01:03 +0200
parents 93e140dbcd44
children 76021ec849c8 8dc21876261e
line wrap: on
line diff
--- a/mercurial/localrepo.py	Sun Jun 15 13:01:01 2008 +0200
+++ b/mercurial/localrepo.py	Sun Jun 15 13:01:03 2008 +0200
@@ -688,7 +688,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