--- a/mercurial/bundle2.py Wed Sep 12 15:17:47 2018 -0700
+++ b/mercurial/bundle2.py Wed Sep 12 15:59:26 2018 -0700
@@ -1779,6 +1779,8 @@
This is a very early implementation that will massive rework before being
inflicted to any end-user.
"""
+ from . import localrepo
+
tr = op.gettransaction()
unpackerversion = inpart.params.get('version', '01')
# We should raise an appropriate exception here
@@ -1795,7 +1797,8 @@
"bundle contains tree manifests, but local repo is "
"non-empty and does not use tree manifests"))
op.repo.requirements.add('treemanifest')
- op.repo._applyopenerreqs()
+ op.repo.svfs.options = localrepo.resolvestorevfsoptions(
+ op.repo.ui, op.repo.requirements)
op.repo._writerequirements()
extrakwargs = {}
targetphase = inpart.params.get('targetphase')