# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@fb.com>
# Date 1411933645 25200
# Node ID f4e39ceb064a0caa17db87c7b553287cfa547552
# Parent  c9276945eba3c4fe659cc3e961c7577c64439484
subrepo: stop pulling bookmark manually

Bookmark pulling is now done with all the other pull steps in the
`exchange.pull` function.

diff -r c9276945eba3 -r f4e39ceb064a mercurial/subrepo.py
--- a/mercurial/subrepo.py	Sat Sep 27 01:59:56 2014 -0700
+++ b/mercurial/subrepo.py	Sun Sep 28 12:47:25 2014 -0700
@@ -9,7 +9,7 @@
 import xml.dom.minidom
 import stat, subprocess, tarfile
 from i18n import _
-import config, util, node, error, cmdutil, bookmarks, match as matchmod
+import config, util, node, error, cmdutil, match as matchmod
 import phases
 import pathutil
 import exchange
@@ -743,10 +743,7 @@
             self._repo.ui.status(_('pulling subrepo %s from %s\n')
                                  % (subrelpath(self), srcurl))
             cleansub = self.storeclean(srcurl)
-            remotebookmarks = other.listkeys('bookmarks')
             self._repo.pull(other)
-            bookmarks.updatefromremote(self._repo.ui, self._repo,
-                                       remotebookmarks, srcurl)
             if cleansub:
                 # keep the repo clean after pull
                 self._cachestorehash(srcurl)