changeset 3862 | 46abbed02b2d |
parent 3861 | db36a4f490f6 |
child 3885 | 1e0b94cfba0e |
child 3925 | 27230c29bfec |
--- a/mercurial/localrepo.py +++ b/mercurial/localrepo.py @@ -683,7 +683,11 @@ class localrepository(repo.repository): m2 = self.manifest.read(c2[0]) if use_dirstate: - branchname = util.fromlocal(self.workingctx().branch()) + branchname = self.workingctx().branch() + try: + branchname = branchname.decode('UTF-8').encode('UTF-8') + except UnicodeDecodeError: + raise util.Abort(_('branch name not in UTF-8!')) else: branchname = ""