Show More
@@ -727,11 +727,13 b' class localrepository(repo.repository):' | |||
|
727 | 727 | # update manifest |
|
728 | 728 | m1.update(new) |
|
729 | 729 | remove.sort() |
|
730 | removed = [] | |
|
730 | 731 | |
|
731 | 732 | for f in remove: |
|
732 | 733 | if f in m1: |
|
733 | 734 | del m1[f] |
|
734 | mn = self.manifest.add(m1, tr, linkrev, c1[0], c2[0], (new, remove)) | |
|
735 | removed.append(f) | |
|
736 | mn = self.manifest.add(m1, tr, linkrev, c1[0], c2[0], (new, removed)) | |
|
735 | 737 | |
|
736 | 738 | # add changeset |
|
737 | 739 | new = new.keys() |
@@ -747,7 +749,7 b' class localrepository(repo.repository):' | |||
|
747 | 749 | if p2 != nullid: |
|
748 | 750 | edittext.append("HG: branch merge") |
|
749 | 751 | edittext.extend(["HG: changed %s" % f for f in changed]) |
|
750 | edittext.extend(["HG: removed %s" % f for f in remove]) | |
|
752 | edittext.extend(["HG: removed %s" % f for f in removed]) | |
|
751 | 753 | if not changed and not remove: |
|
752 | 754 | edittext.append("HG: no files changed") |
|
753 | 755 | edittext.append("") |
@@ -765,7 +767,7 b' class localrepository(repo.repository):' | |||
|
765 | 767 | text = '\n'.join(lines) |
|
766 | 768 | if branchname: |
|
767 | 769 | extra["branch"] = branchname |
|
768 | n = self.changelog.add(mn, changed + remove, text, tr, p1, p2, | |
|
770 | n = self.changelog.add(mn, changed + removed, text, tr, p1, p2, | |
|
769 | 771 | user, date, extra) |
|
770 | 772 | self.hook('pretxncommit', throw=True, node=hex(n), parent1=xp1, |
|
771 | 773 | parent2=xp2) |
@@ -775,7 +777,7 b' class localrepository(repo.repository):' | |||
|
775 | 777 | self.dirstate.setparents(n) |
|
776 | 778 | if use_dirstate: |
|
777 | 779 | self.dirstate.update(new, "n") |
|
778 | self.dirstate.forget(remove) | |
|
780 | self.dirstate.forget(removed) | |
|
779 | 781 | |
|
780 | 782 | self.hook("commit", node=hex(n), parent1=xp1, parent2=xp2) |
|
781 | 783 | return n |
General Comments 0
You need to be logged in to leave comments.
Login now