# HG changeset patch # User Martin Geisler <mg@lazybytes.net> # Date 1303212319 -7200 # Tue Apr 19 13:25:19 2011 +0200 # Branch stable # Node ID 044e1356327d23acf5c0672b37d7d5a64126254c # Parent 86b5cc1e8be8f8e0d2e6d1b8b6306e16566483ff rollback: lower-case warning issued when branch cannot be reset Also improved the word order. diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py --- a/mercurial/localrepo.py +++ b/mercurial/localrepo.py @@ -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() diff --git a/tests/test-rollback.t b/tests/test-rollback.t --- a/tests/test-rollback.t +++ b/tests/test-rollback.t @@ -57,7 +57,7 @@ $ rm .hg/undo.branch $ hg rollback repository tip rolled back to revision -1 (undo commit) - Named branch could not be reset, current branch still is: test + named branch could not be reset, current branch is still: test working directory now based on revision -1 $ hg branch test