# HG changeset patch # User Thomas Arendsen Hein # Date 1257633346 -3600 # Node ID 75520c24fedaa28fa4aab8843cf073971386e7cb # Parent b1dad6b4dfae0e7aaf016e4ebfb39e29597c0087 Branch name printed since a3d73b3e1f8a now in local encoding. diff -r b1dad6b4dfae -r 75520c24feda mercurial/hg.py --- a/mercurial/hg.py Sat Nov 07 23:27:25 2009 +0100 +++ b/mercurial/hg.py Sat Nov 07 23:35:46 2009 +0100 @@ -9,7 +9,7 @@ from i18n import _ from lock import release import localrepo, bundlerepo, httprepo, sshrepo, statichttprepo -import lock, util, extensions, error +import lock, util, extensions, error, encoding import merge as _merge import verify as _verify import errno, os, shutil @@ -320,7 +320,8 @@ except error.RepoLookupError: continue bn = dest_repo[uprev].branch() - dest_repo.ui.status(_("updating to branch %s\n") % bn) + dest_repo.ui.status(_("updating to branch %s\n") + % encoding.tolocal(bn)) _update(dest_repo, uprev) return src_repo, dest_repo