Commit a267a7d3 authored by Anton Shestakov's avatar Anton Shestakov
Browse files

topic: copy an abort message (new branch) from upstream exactly

This abort message already exists in core hg, so let's reuse the exact wording
and quoting from there.
parent 7681e3c2237a
...@@ -217,5 +217,5 @@ ...@@ -217,5 +217,5 @@
raise error.Abort(msg) raise error.Abort(msg)
for branch, newnb in finalheads.items(): for branch, newnb in finalheads.items():
if 1 < newnb: if 1 < newnb:
msg = _(b'push create more than 1 head on new branch "%s"' msg = _(b"push creates new branch '%s' with multiple heads"
% branch) % branch)
...@@ -221,5 +221,7 @@ ...@@ -221,5 +221,7 @@
% branch) % branch)
raise error.Abort(msg) hint = _(b"merge or see 'hg help push' for details about "
b"pushing new heads")
raise error.Abort(msg, hint=hint)
def validator(tr): def validator(tr):
_validate(tr) _validate(tr)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment