changeset 6680 | deda205a00e1 |
parent 6535 | 93e140dbcd44 |
child 6685 | 76021ec849c8 |
child 6874 | 8dc21876261e |
--- 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