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.
discovery: tweak error message for multiple branch heads
authorMads Kiilerich <madski@unity3d.com>
Sat, 16 Nov 2013 15:46:29 -0500
changeset 20050 877e05b46509
parent 20049 8cebb59ee4e2
child 20051 b988b3b19303
discovery: tweak error message for multiple branch heads
mercurial/discovery.py file | annotate | diff | comparison | revisions
tests/test-push-warn.t file | annotate | diff | comparison | revisions 
--- 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")
--- a/tests/test-push-warn.t	Sat Nov 16 15:46:29 2013 -0500
+++ b/tests/test-push-warn.t	Sat Nov 16 15:46:29 2013 -0500
@@ -367,7 +367,7 @@
   $ hg push --branch f --new-branch ../f
   pushing to ../f
   searching for changes
-  abort: push creates multiple headed new branch 'f'
+  abort: push creates new branch 'f' with multiple heads
   (merge or see "hg help push" for details about pushing new heads)
   [255]
   $ hg push --branch f --new-branch --force ../f
mercurial