Branch name printed since a3d73b3e1f8a now in local encoding.
authorThomas Arendsen Hein <thomas@intevation.de>
Sat, 07 Nov 2009 23:35:46 +0100
changeset 9788 75520c24feda
parent 9787 b1dad6b4dfae
child 9789 79e749b26b2b
Branch name printed since a3d73b3e1f8a now in local encoding.
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