Mercurial > hg

changeset 12001:4b1197f15313

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Matt Mackall <mpm@selenic.com>
date Thu, 19 Aug 2010 17:29:13 -0500
parents 3361075816f8 (current diff) 31dde4c3bb83 (diff)
children ce066f8aa0b2
files hgext/bookmarks.py
diffstat 1 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/bookmarks.py	Fri Aug 13 19:42:28 2010 +0530
+++ b/hgext/bookmarks.py	Thu Aug 19 17:29:13 2010 -0500
@@ -442,9 +442,12 @@
             if b in repo._bookmarks:
                 ui.status(_("exporting bookmark %s\n") % b)
                 new = repo[b].hex()
-            else:
+            elif b in rb:
                 ui.status(_("deleting remote bookmark %s\n") % b)
                 new = '' # delete
+            else:
+                ui.warn(_('bookmark %s does not exist on the local or remote repository!\n') % b)
+                return 2
             old = rb.get(b, '')
             r = other.pushkey('bookmarks', b, old, new)
             if not r: