# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1282256953 18000
# Node ID 4b1197f15313e08c9300c012aadbe2ac9eb04c78
# Parent  3361075816f8f3f068cf8d71df31794839308173# Parent  31dde4c3bb83fc042b7ed1341b536eea39431ce8
merge with stable

diff -r 3361075816f8 -r 4b1197f15313 hgext/bookmarks.py
--- 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: