##// END OF EJS Templates
bookmarks: Check if the bookmark to delete exists on the remote
David Soria Parra -
r11994:31dde4c3 stable
parent child Browse files
Show More
@@ -442,9 +442,12 b' def push(oldpush, ui, repo, dest=None, *'
442 if b in repo._bookmarks:
442 if b in repo._bookmarks:
443 ui.status(_("exporting bookmark %s\n") % b)
443 ui.status(_("exporting bookmark %s\n") % b)
444 new = repo[b].hex()
444 new = repo[b].hex()
445 else:
445 elif b in rb:
446 ui.status(_("deleting remote bookmark %s\n") % b)
446 ui.status(_("deleting remote bookmark %s\n") % b)
447 new = '' # delete
447 new = '' # delete
448 else:
449 ui.warn(_('bookmark %s does not exist on the local or remote repository!\n') % b)
450 return 2
448 old = rb.get(b, '')
451 old = rb.get(b, '')
449 r = other.pushkey('bookmarks', b, old, new)
452 r = other.pushkey('bookmarks', b, old, new)
450 if not r:
453 if not r:
General Comments 0
You need to be logged in to leave comments. Login now