Show More
@@ -316,7 +316,7 b' def checkheads(repo, remote, outgoing, r' | |||||
316 | error = (_("push creates multiple headed new branch '%s'") |
|
316 | error = (_("push creates multiple headed new branch '%s'") | |
317 | % (branch)) |
|
317 | % (branch)) | |
318 | hint = _("merge or" |
|
318 | hint = _("merge or" | |
319 | " see \"hg help push\" for detail about" |
|
319 | " see \"hg help push\" for details about" | |
320 | " pushing new heads") |
|
320 | " pushing new heads") | |
321 | elif len(newhs) > len(oldhs): |
|
321 | elif len(newhs) > len(oldhs): | |
322 | # strip updates to existing remote heads from the new heads list |
|
322 | # strip updates to existing remote heads from the new heads list |
@@ -368,7 +368,7 b' Pushing muliple headed new branch:' | |||||
368 | pushing to ../f |
|
368 | pushing to ../f | |
369 | searching for changes |
|
369 | searching for changes | |
370 | abort: push creates multiple headed new branch 'f' |
|
370 | abort: push creates multiple headed new branch 'f' | |
371 | (merge or see "hg help push" for detail about pushing new heads) |
|
371 | (merge or see "hg help push" for details about pushing new heads) | |
372 | [255] |
|
372 | [255] | |
373 | $ hg push --branch f --new-branch --force ../f |
|
373 | $ hg push --branch f --new-branch --force ../f | |
374 | pushing to ../f |
|
374 | pushing to ../f |
General Comments 0
You need to be logged in to leave comments.
Login now