mercurial/bookmarks.py
changeset 25564 847fce27effc
parent 25100 d6e7ac651973
child 25569 2612e6dab189
--- a/mercurial/bookmarks.py	Thu Jun 11 08:54:24 2015 -0400
+++ b/mercurial/bookmarks.py	Thu Jun 11 17:19:48 2015 -0700
@@ -401,6 +401,11 @@
         if scid in repo: # add remote bookmarks for changes we already have
             changed.append((b, bin(scid), status,
                             _("adding remote bookmark %s\n") % (b)))
+        elif b in explicit:
+            explicit.remove(b)
+            ui.warn(_("remote bookmark %s points to locally missing %s\n")
+                    % (b, scid[:12]))
+
     for b, scid, dcid in advsrc:
         changed.append((b, bin(scid), status,
                         _("updating bookmark %s\n") % (b)))
@@ -427,6 +432,11 @@
             explicit.discard(b)
             changed.append((b, bin(scid), status,
                             _("importing bookmark %s\n") % (b)))
+    for b, scid, dcid in differ:
+        if b in explicit:
+            explicit.remove(b)
+            ui.warn(_("remote bookmark %s points to locally missing %s\n")
+                    % (b, scid[:12]))
 
     if changed:
         tr = trfunc()