Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/localrepo.py @ 6685:76021ec849c8
Merge with crew-stable
| author | Patrick Mezard <pmezard@gmail.com> |
|---|---|
| date | Sun, 15 Jun 2008 13:05:39 +0200 |
| parents | 3ef6adad4e43 deda205a00e1 |
| children | fec6bc978843 |
comparison
equal
deleted
inserted
replaced
| 6684:3ef6adad4e43 | 6685:76021ec849c8 |
|---|---|
| 693 fp1 = manifest1.get(fn, nullid) | 693 fp1 = manifest1.get(fn, nullid) |
| 694 fp2 = manifest2.get(fn, nullid) | 694 fp2 = manifest2.get(fn, nullid) |
| 695 | 695 |
| 696 meta = {} | 696 meta = {} |
| 697 cp = self.dirstate.copied(fn) | 697 cp = self.dirstate.copied(fn) |
| 698 if cp: | 698 if cp and cp != fn: |
| 699 # Mark the new revision of this file as a copy of another | 699 # Mark the new revision of this file as a copy of another |
| 700 # file. This copy data will effectively act as a parent | 700 # file. This copy data will effectively act as a parent |
| 701 # of this new revision. If this is a merge, the first | 701 # of this new revision. If this is a merge, the first |
| 702 # parent will be the nullid (meaning "look up the copy data") | 702 # parent will be the nullid (meaning "look up the copy data") |
| 703 # and the second one will be the other parent. For example: | 703 # and the second one will be the other parent. For example: |