Mercurial > public > mercurial-scm > hg-stable
diff mercurial/localrepo.py @ 13957:044e1356327d stable
rollback: lower-case warning issued when branch cannot be reset
Also improved the word order.
| author | Martin Geisler <mg@lazybytes.net> |
|---|---|
| date | Tue, 19 Apr 2011 13:25:19 +0200 |
| parents | 919174c0aaff |
| children | 141f88ae5276 89e7d35e0ef0 |
line wrap: on
line diff
--- a/mercurial/localrepo.py Mon Apr 18 13:57:22 2011 +0200 +++ b/mercurial/localrepo.py Tue Apr 19 13:25:19 2011 +0200 @@ -736,8 +736,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()