equal
deleted
inserted
replaced
339 if dhs: |
339 if dhs: |
340 if error is None: |
340 if error is None: |
341 if branch not in ('default', None): |
341 if branch not in ('default', None): |
342 error = _("push creates new remote head %s " |
342 error = _("push creates new remote head %s " |
343 "on branch '%s'!") % (short(dhs[0]), branch) |
343 "on branch '%s'!") % (short(dhs[0]), branch) |
|
344 elif repo[dhs[0]].bookmarks(): |
|
345 error = _("push creates new remote head %s " |
|
346 "with bookmark '%s'!") % ( |
|
347 short(dhs[0]), repo[dhs[0]].bookmarks()[0]) |
344 else: |
348 else: |
345 error = _("push creates new remote head %s!" |
349 error = _("push creates new remote head %s!" |
346 ) % short(dhs[0]) |
350 ) % short(dhs[0]) |
347 if unsyncedheads: |
351 if unsyncedheads: |
348 hint = _("pull and merge or" |
352 hint = _("pull and merge or" |