Mercurial > hg
changeset 20050:877e05b46509
discovery: tweak error message for multiple branch heads
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Sat, 16 Nov 2013 15:46:29 -0500 |
| parents | 8cebb59ee4e2 |
| children | b988b3b19303 |
| files | mercurial/discovery.py tests/test-push-warn.t |
| diffstat | 2 files changed, 3 insertions(+), 3 deletions(-) [+] |
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")
--- 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