Show More
@@ -610,10 +610,7 b' class localrepository(repo.repository):' | |||
|
610 | 610 | m1 = self.manifest.read(c1[0]).copy() |
|
611 | 611 | m2 = self.manifest.read(c2[0]) |
|
612 | 612 | |
|
613 | try: | |
|
614 | branchname = self.opener("branch").read().rstrip() | |
|
615 | except IOError: | |
|
616 | branchname = "" | |
|
613 | branchname = self.workingctx().branch() | |
|
617 | 614 | oldname = c1[5].get("branch", "") |
|
618 | 615 | |
|
619 | 616 | if not commit and not remove and not force and p2 == nullid and \ |
General Comments 0
You need to be logged in to leave comments.
Login now