Mercurial > hg

diff mercurial/bookmarks.py @ 16697:c285aae10f6c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bookmarks: pull new bookmarks from remote by default (BC)
author Levi Bard <levi@unity3d.com>
date Sat, 12 May 2012 17:00:01 +0200
parents 5983de86462c
children a270ec977ba6
line wrap: on
line diff
--- 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)