Mercurial > public > mercurial-scm > hg-stable
diff mercurial/localrepo.py @ 13959:141f88ae5276
merge with stable
| author | Martin Geisler <mg@lazybytes.net> |
|---|---|
| date | Tue, 19 Apr 2011 15:19:54 +0200 |
| parents | cff56a0ed18e 044e1356327d |
| children | d13913355390 |
line wrap: on
line diff
--- a/mercurial/localrepo.py Tue Apr 19 12:04:44 2011 +0200 +++ b/mercurial/localrepo.py Tue Apr 19 15:19:54 2011 +0200 @@ -743,8 +743,8 @@ branch = self.opener("undo.branch").read() self.dirstate.setbranch(branch) except IOError: - self.ui.warn(_("Named branch could not be reset, " - "current branch still is: %s\n") + self.ui.warn(_("named branch could not be reset, " + "current branch is still: %s\n") % self.dirstate.branch()) self.invalidate() self.dirstate.invalidate()