# HG changeset patch
# User Mads Kiilerich <madski@unity3d.com>
# Date 1384634789 18000
# Node ID 877e05b46509d462cf0a698c21dbf383c710f874
# Parent  8cebb59ee4e20d7dab9058e34d334984a1df5001
discovery: tweak error message for multiple branch heads

diff -r 8cebb59ee4e2 -r 877e05b46509 mercurial/discovery.py
--- 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")
diff -r 8cebb59ee4e2 -r 877e05b46509 tests/test-push-warn.t
--- 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