equal
deleted
inserted
replaced
335 " pushing new heads") |
335 " pushing new heads") |
336 else: |
336 else: |
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 not None: |
340 if branch is None: |
341 repo.ui.note(_("new remote heads on branch '%s'\n") % branch) |
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(_("new remote head %s\n") % short(h)) |
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 |
347 # 6. Check for unsynced changes on involved branches. |
349 # 6. Check for unsynced changes on involved branches. |
348 if unsynced: |
350 if unsynced: |