equal
deleted
inserted
replaced
449 new = repo[b].hex() |
449 new = repo[b].hex() |
450 elif b in rb: |
450 elif b in rb: |
451 ui.status(_("deleting remote bookmark %s\n") % b) |
451 ui.status(_("deleting remote bookmark %s\n") % b) |
452 new = '' # delete |
452 new = '' # delete |
453 else: |
453 else: |
454 ui.warn(_('bookmark %s does not exist on the local or remote repository!\n') % b) |
454 ui.warn(_('bookmark %s does not exist on the local ' |
|
455 'or remote repository!\n') % b) |
455 return 2 |
456 return 2 |
456 old = rb.get(b, '') |
457 old = rb.get(b, '') |
457 r = other.pushkey('bookmarks', b, old, new) |
458 r = other.pushkey('bookmarks', b, old, new) |
458 if not r: |
459 if not r: |
459 ui.warn(_('updating bookmark %s failed!\n') % b) |
460 ui.warn(_('updating bookmark %s failed!\n') % b) |