Mercurial > public > mercurial-scm > hg-stable

diff mercurial/subrepo.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 80ec63090a7a
children 309e49491253
line wrap: on
line diff
--- a/mercurial/subrepo.py	Tue Dec 06 14:17:33 2011 -0600
+++ b/mercurial/subrepo.py	Wed Dec 07 16:19:39 2011 -0600
@@ -484,7 +484,8 @@
                 self._repo.ui.status(_('pulling subrepo %s from %s\n')
                                      % (subrelpath(self), srcurl))
                 self._repo.pull(other)
-            bookmarks.updatefromremote(self._repo.ui, self._repo, other)
+            bookmarks.updatefromremote(self._repo.ui, self._repo, other,
+                                       srcurl)
 
     def get(self, state, overwrite=False):
         self._get(state)