changeset 3440 | 0f1fd9854cdc |
parent 3439 | a7ef6b6cc311 |
child 3443 | e6045fc3cd50 |
--- a/mercurial/localrepo.py +++ b/mercurial/localrepo.py @@ -610,10 +610,7 @@ class localrepository(repo.repository): m1 = self.manifest.read(c1[0]).copy() m2 = self.manifest.read(c2[0]) - try: - branchname = self.opener("branch").read().rstrip() - except IOError: - branchname = "" + branchname = self.workingctx().branch() oldname = c1[5].get("branch", "") if not commit and not remove and not force and p2 == nullid and \