mercurial/bookmarks.py

--- a/mercurial/bookmarks.py	Thu May 03 15:14:58 2012 +0200
+++ b/mercurial/bookmarks.py	Sat May 12 17:00:01 2012 +0200
@@ -221,6 +221,11 @@
                     repo._bookmarks[n] = cr.node()
                     changed = True
                     ui.warn(_("divergent bookmark %s stored as %s\n") % (k, n))
+        elif rb[k] in repo:
+            # add remote bookmarks for changes we already have
+            repo._bookmarks[k] = repo[rb[k]].node()
+            changed = True
+            ui.status(_("adding remote bookmark %s\n") % k)
 
     if changed:
         write(repo)