Commit 7681e3c2 authored by Anton Shestakov's avatar Anton Shestakov
Browse files

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

This abort message already exists in core hg, so let's reuse the exact wording
and quoting from there.
parent bed4fc158fc9
......@@ -213,7 +213,7 @@
for branch, oldnb in tr._prepushheads.items():
newnb = finalheads.pop(branch, 0)
if oldnb < newnb:
msg = _(b'push create a new head on branch "%s"' % branch)
msg = _(b"push creates a new head on branch '%s'" % branch)
raise error.Abort(msg)
for branch, newnb in finalheads.items():
if 1 < newnb:
......
......@@ -503,5 +503,5 @@
pushing to repoB
searching for changes
no changes found
abort: push create a new head on branch "default"
abort: push creates a new head on branch 'default'
[255]
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