Show More
@@ -9,7 +9,7 b' import errno, os, re, shutil, posixpath,' | |||||
9 | import xml.dom.minidom |
|
9 | import xml.dom.minidom | |
10 | import stat, subprocess, tarfile |
|
10 | import stat, subprocess, tarfile | |
11 | from i18n import _ |
|
11 | from i18n import _ | |
12 |
import config, util, node, error, cmdutil, |
|
12 | import config, util, node, error, cmdutil, match as matchmod | |
13 | import phases |
|
13 | import phases | |
14 | import pathutil |
|
14 | import pathutil | |
15 | import exchange |
|
15 | import exchange | |
@@ -743,10 +743,7 b' class hgsubrepo(abstractsubrepo):' | |||||
743 | self._repo.ui.status(_('pulling subrepo %s from %s\n') |
|
743 | self._repo.ui.status(_('pulling subrepo %s from %s\n') | |
744 | % (subrelpath(self), srcurl)) |
|
744 | % (subrelpath(self), srcurl)) | |
745 | cleansub = self.storeclean(srcurl) |
|
745 | cleansub = self.storeclean(srcurl) | |
746 | remotebookmarks = other.listkeys('bookmarks') |
|
|||
747 | self._repo.pull(other) |
|
746 | self._repo.pull(other) | |
748 | bookmarks.updatefromremote(self._repo.ui, self._repo, |
|
|||
749 | remotebookmarks, srcurl) |
|
|||
750 | if cleansub: |
|
747 | if cleansub: | |
751 | # keep the repo clean after pull |
|
748 | # keep the repo clean after pull | |
752 | self._cachestorehash(srcurl) |
|
749 | self._cachestorehash(srcurl) |
General Comments 0
You need to be logged in to leave comments.
Login now