Show More
@@ -337,10 +337,12 b' def checkheads(repo, remote, outgoing, r' | |||||
337 | hint = _("merge or" |
|
337 | hint = _("merge or" | |
338 | " see \"hg help push\" for details about" |
|
338 | " see \"hg help push\" for details about" | |
339 | " pushing new heads") |
|
339 | " pushing new heads") | |
340 |
if branch is |
|
340 | if branch is None: | |
341 |
repo.ui.note(_("new remote heads |
|
341 | repo.ui.note(_("new remote heads:\n")) | |
|
342 | else: | |||
|
343 | repo.ui.note(_("new remote heads on branch '%s':\n") % branch) | |||
342 | for h in dhs: |
|
344 | for h in dhs: | |
343 |
repo.ui.note( |
|
345 | repo.ui.note((" %s\n") % short(h)) | |
344 | if error: |
|
346 | if error: | |
345 | raise util.Abort(error, hint=hint) |
|
347 | raise util.Abort(error, hint=hint) | |
346 |
|
348 |
@@ -38,8 +38,8 b'' | |||||
38 | query 2; still undecided: 1, sample size is: 1 |
|
38 | query 2; still undecided: 1, sample size is: 1 | |
39 | 2 total queries |
|
39 | 2 total queries | |
40 | listing keys for "bookmarks" |
|
40 | listing keys for "bookmarks" | |
41 | new remote heads on branch 'default' |
|
41 | new remote heads on branch 'default': | |
42 |
|
|
42 | 1e108cc5548c | |
43 | abort: push creates new remote head 1e108cc5548c! |
|
43 | abort: push creates new remote head 1e108cc5548c! | |
44 | (pull and merge or see "hg help push" for details about pushing new heads) |
|
44 | (pull and merge or see "hg help push" for details about pushing new heads) | |
45 | [255] |
|
45 | [255] | |
@@ -129,9 +129,9 b'' | |||||
129 | $ hg push -v -r 3 -r 4 ../c |
|
129 | $ hg push -v -r 3 -r 4 ../c | |
130 | pushing to ../c |
|
130 | pushing to ../c | |
131 | searching for changes |
|
131 | searching for changes | |
132 | new remote heads on branch 'default' |
|
132 | new remote heads on branch 'default': | |
133 |
|
|
133 | a5dda829a167 | |
134 |
|
|
134 | ee8fbc7a0295 | |
135 | abort: push creates new remote head a5dda829a167! |
|
135 | abort: push creates new remote head a5dda829a167! | |
136 | (merge or see "hg help push" for details about pushing new heads) |
|
136 | (merge or see "hg help push" for details about pushing new heads) | |
137 | [255] |
|
137 | [255] |
General Comments 0
You need to be logged in to leave comments.
Login now