← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_workingtree/__init__.py

  • Committer: Jelmer Vernooij
  • Date: 2012-02-20 12:19:29 UTC
  • mfrom: (6437.23.11 2.5)
  • mto: (6581.1.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 6582.
  • Revision ID: jelmer@samba.org-20120220121929-7ni2psvjoatm1yp4
Merge bzr/2.5.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_workingtree/__init__.py
76
76
 
77
77
    def make_branch_builder(self, relpath, format=None):
78
78
        if format is None:
79
 
            format = self.bzrdir_format
 
79
            format = self.workingtree_format.get_controldir_for_branch()
80
80
        builder = branchbuilder.BranchBuilder(self.get_transport(relpath),
81
81
                                              format=format)
82
82
        return builder