Mercurial > hg > mercurial-source

diff mercurial/commands.py @ 15614:260a6449d83a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bookmarks: mark divergent bookmarks with book@pathalias when source in [paths]
author Matt Mackall <mpm@selenic.com>
date Wed, 07 Dec 2011 16:19:39 -0600
parents ec8a49c46d7e
children 0aca2695a110
line wrap: on
line diff
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -4273,7 +4273,7 @@
             raise util.Abort(err)
 
     modheads = repo.pull(other, heads=revs, force=opts.get('force'))
-    bookmarks.updatefromremote(ui, repo, other)
+    bookmarks.updatefromremote(ui, repo, other, source)
     if checkout:
         checkout = str(repo.changelog.rev(other.lookup(checkout)))
     repo._subtoppath = source