equal
deleted
inserted
replaced
649 |
649 |
650 meta = {} |
650 meta = {} |
651 cp = self.dirstate.copied(fn) |
651 cp = self.dirstate.copied(fn) |
652 if cp: |
652 if cp: |
653 # Mark the new revision of this file as a copy of another |
653 # Mark the new revision of this file as a copy of another |
654 # file. This copy data will effectively act as a parent |
654 # file. This copy data will effectively act as a parent |
655 # of this new revision. If this is a merge, the first |
655 # of this new revision. If this is a merge, the first |
656 # parent will be the nullid (meaning "look up the copy data") |
656 # parent will be the nullid (meaning "look up the copy data") |
657 # and the second one will be the other parent. For example: |
657 # and the second one will be the other parent. For example: |
658 # |
658 # |
659 # 0 --- 1 --- 3 rev1 changes file foo |
659 # 0 --- 1 --- 3 rev1 changes file foo |
660 # \ / rev2 renames foo to bar and changes it |
660 # \ / rev2 renames foo to bar and changes it |