Mercurial > public > mercurial-scm > hg-stable

diff mercurial/localrepo.py @ 17360:935831597e16 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rollback: write dirstate branch with correct encoding
author Sune Foldager <cryo@cyanite.org>
date Wed, 15 Aug 2012 12:04:50 +0200
parents 9f94358f9f93
children b05e517c2236 17c3dbf3026f
line wrap: on
line diff
--- a/mercurial/localrepo.py	Thu Aug 02 19:10:45 2012 +0400
+++ b/mercurial/localrepo.py	Wed Aug 15 12:04:50 2012 +0200
@@ -1009,7 +1009,7 @@
             util.rename(self.join('undo.dirstate'), self.join('dirstate'))
             try:
                 branch = self.opener.read('undo.branch')
-                self.dirstate.setbranch(branch)
+                self.dirstate.setbranch(encoding.tolocal(branch))
             except IOError:
                 ui.warn(_('named branch could not be reset: '
                           'current branch is still \'%s\'\n')