← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bzrdir.py

Merge in upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bzrdir.py
37
37
                            sha_string,
38
38
                            )
39
39
from bzrlib.store.text import TextStore
40
 
from bzrlib.store.versioned.weave import WeaveStore
 
40
from bzrlib.store.versioned import WeaveStore
41
41
from bzrlib.symbol_versioning import *
42
42
from bzrlib.trace import mutter
43
43
from bzrlib.transactions import PassThroughTransaction
524
524
            source_branch.sprout(result, revision_id=revision_id)
525
525
        else:
526
526
            result.create_branch()
527
 
        try:
528
 
            self.open_workingtree().clone(result,
529
 
                                          revision_id=revision_id, 
530
 
                                          basis=basis_tree)
531
 
        except (errors.NoWorkingTree, errors.NotLocalUrl):
532
 
            result.create_workingtree()
 
527
        result.create_workingtree()
533
528
        return result
534
529
 
535
530
 
640
635
            self.open_branch().sprout(result, revision_id=revision_id)
641
636
        except errors.NotBranchError:
642
637
            pass
643
 
        try:
644
 
            self.open_workingtree().clone(result, basis=basis_tree)
645
 
        except (errors.NotBranchError, errors.NotLocalUrl):
646
 
            # we always want a working tree
647
 
            WorkingTreeFormat2().initialize(result)
 
638
        # we always want a working tree
 
639
        WorkingTreeFormat2().initialize(result)
648
640
        return result
649
641
 
650
642