Mercurial > public > mercurial-scm > hg

diff mercurial/discovery.py @ 20050:877e05b46509

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
discovery: tweak error message for multiple branch heads
author Mads Kiilerich <madski@unity3d.com>
date Sat, 16 Nov 2013 15:46:29 -0500
parents 8179eb28983b
children b988b3b19303
line wrap: on
line diff
--- a/mercurial/discovery.py	Sat Nov 16 15:46:29 2013 -0500
+++ b/mercurial/discovery.py	Sat Nov 16 15:46:29 2013 -0500
@@ -313,8 +313,8 @@
             if 1 < len(newhs):
                 dhs = list(newhs)
                 if error is None:
-                    error = (_("push creates multiple headed new branch '%s'")
-                             % (branch))
+                    error = (_("push creates new branch '%s' "
+                               "with multiple heads") % (branch))
                     hint = _("merge or"
                              " see \"hg help push\" for details about"
                              " pushing new heads")