← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: John Arbash Meinel
  • Date: 2011-09-12 18:40:02 UTC
  • mfrom: (6132 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6133.
  • Revision ID: john@arbash-meinel.com-20110912184002-o23eu21fdgp35h2q
Merge bzr.dev, resolve release-notes (aka NEWS) conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_interbranch/__init__.py
91
91
 
92
92
    def make_from_branch_and_tree(self, relpath):
93
93
        """Create a branch on the default transport and a working tree for it."""
94
 
        b = self.make_from_branch(relpath)
95
 
        return b.bzrdir.create_workingtree()
 
94
        return self.make_branch_and_tree(relpath,
 
95
            format=self.branch_format_from._matchingbzrdir)
96
96
 
97
97
    def make_from_branch_builder(self, relpath):
98
98
        default_format = BzrDirFormat.get_default_format()
114
114
 
115
115
    def make_to_branch_and_tree(self, relpath):
116
116
        """Create a branch on the default transport and a working tree for it."""
117
 
        b = self.make_to_branch(relpath)
118
 
        return b.bzrdir.create_workingtree()
 
117
        return self.make_branch_and_tree(relpath,
 
118
            format=self.branch_format_to._matchingbzrdir)
119
119
 
120
120
    def sprout_to(self, origdir, to_url):
121
121
        """Sprout a bzrdir, using to_format for the new branch."""