Mercurial > public > mercurial-scm > hg

diff mercurial/localrepo.py @ 17833:0c1185f6ddd7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
obsolete: simplify push abort message to: push includes xxx changeset: yyyyyyyyyy
author push includes an xxx changeset: yyyyyyyyyy
date Fri, 19 Oct 2012 00:46:39 +0200
parents 361ab1e2086f
children 743d04dd48ec
line wrap: on
line diff
--- a/mercurial/localrepo.py	Fri Oct 19 00:43:44 2012 +0200
+++ b/mercurial/localrepo.py	Fri Oct 19 00:46:39 2012 +0200
@@ -1870,8 +1870,8 @@
                         # then, save the iteration
                         if self.obsstore:
                             # this message are here for 80 char limit reason
-                            mso = _("push includes an obsolete changeset: %s!")
-                            msu = _("push includes an unstable changeset: %s!")
+                            mso = _("push includes obsolete changeset: %s!")
+                            msu = _("push includes unstable changeset: %s!")
                             # If we are to push if there is at least one
                             # obsolete or unstable changeset in missing, at
                             # least one of the missinghead will be obsolete or