Show More
@@ -761,6 +761,8 b' class localrepository(repo.repository):' | |||
|
761 | 761 | edittext.append("HG: user: %s" % user) |
|
762 | 762 | if p2 != nullid: |
|
763 | 763 | edittext.append("HG: branch merge") |
|
764 | if branchname: | |
|
765 | edittext.append("HG: branch %s" % util.tolocal(branchname)) | |
|
764 | 766 | edittext.extend(["HG: changed %s" % f for f in changed]) |
|
765 | 767 | edittext.extend(["HG: removed %s" % f for f in removed]) |
|
766 | 768 | if not changed and not remove: |
@@ -786,6 +788,9 b' class localrepository(repo.repository):' | |||
|
786 | 788 | parent2=xp2) |
|
787 | 789 | tr.close() |
|
788 | 790 | |
|
791 | if self.branchcache and "branch" in extra: | |
|
792 | self.branchcache[util.tolocal(extra["branch"])] = n | |
|
793 | ||
|
789 | 794 | if use_dirstate or update_dirstate: |
|
790 | 795 | self.dirstate.setparents(n) |
|
791 | 796 | if use_dirstate: |
General Comments 0
You need to be logged in to leave comments.
Login now