← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bzrdir.py

  • Committer: Martin Pool
  • Date: 2006-03-06 07:11:09 UTC
  • mfrom: (1591 +trunk)
  • mto: This revision was merged to the branch mainline in revision 1593.
  • Revision ID: mbp@sourcefrog.net-20060306071109-6b35534e38610c43
[merge] bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bzrdir.py
525
525
            source_branch.sprout(result, revision_id=revision_id)
526
526
        else:
527
527
            result.create_branch()
528
 
        try:
529
 
            self.open_workingtree().clone(result,
530
 
                                          revision_id=revision_id, 
531
 
                                          basis=basis_tree)
532
 
        except (errors.NoWorkingTree, errors.NotLocalUrl):
533
 
            result.create_workingtree()
 
528
        result.create_workingtree()
534
529
        return result
535
530
 
536
531
 
642
637
            self.open_branch().sprout(result, revision_id=revision_id)
643
638
        except errors.NotBranchError:
644
639
            pass
645
 
        try:
646
 
            self.open_workingtree().clone(result, basis=basis_tree)
647
 
        except (errors.NotBranchError, errors.NotLocalUrl):
648
 
            # we always want a working tree
649
 
            WorkingTreeFormat2().initialize(result)
 
640
        # we always want a working tree
 
641
        WorkingTreeFormat2().initialize(result)
650
642
        return result
651
643
 
652
644