# HG changeset patch # User Matt Mackall # Date 1161141974 18000 # Node ID 0f1fd9854cdc5665d4e3c8ed21f9fcdec78e23d6 # Parent a7ef6b6cc311d6c7c781bfefb93099edb107cd9f commit: read branch with workingctx diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py --- 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 \