Mercurial > public > mercurial-scm > hg
comparison mercurial/localrepo.py @ 6680:deda205a00e1
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 |
comparison
equal
deleted
inserted
replaced
| 6679:d286ec1bdcff | 6680:deda205a00e1 |
|---|---|
| 686 fp1 = manifest1.get(fn, nullid) | 686 fp1 = manifest1.get(fn, nullid) |
| 687 fp2 = manifest2.get(fn, nullid) | 687 fp2 = manifest2.get(fn, nullid) |
| 688 | 688 |
| 689 meta = {} | 689 meta = {} |
| 690 cp = self.dirstate.copied(fn) | 690 cp = self.dirstate.copied(fn) |
| 691 if cp: | 691 if cp and cp != fn: |
| 692 # Mark the new revision of this file as a copy of another | 692 # Mark the new revision of this file as a copy of another |
| 693 # file. This copy data will effectively act as a parent | 693 # file. This copy data will effectively act as a parent |
| 694 # of this new revision. If this is a merge, the first | 694 # of this new revision. If this is a merge, the first |
| 695 # parent will be the nullid (meaning "look up the copy data") | 695 # parent will be the nullid (meaning "look up the copy data") |
| 696 # and the second one will be the other parent. For example: | 696 # and the second one will be the other parent. For example: |