Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rollback: lower-case warning issued when branch cannot be reset stable
authorMartin Geisler <mg@lazybytes.net>
Tue, 19 Apr 2011 13:25:19 +0200
branchstable
changeset 13957 044e1356327d
parent 13955 86b5cc1e8be8
child 13958 71f51cc71652
rollback: lower-case warning issued when branch cannot be reset Also improved the word order.
mercurial/localrepo.py file | annotate | diff | comparison | revisions
tests/test-rollback.t file | annotate | diff | comparison | revisions 
--- 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()
--- a/tests/test-rollback.t	Mon Apr 18 13:57:22 2011 +0200
+++ b/tests/test-rollback.t	Tue Apr 19 13:25:19 2011 +0200
@@ -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
mercurial