← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_bound_branches.py

Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_bound_branches.py
20
20
import os
21
21
from cStringIO import StringIO
22
22
 
 
23
from bzrlib import (
 
24
    bzrdir,
 
25
    )
23
26
from bzrlib.branch import Branch
24
27
from bzrlib.bzrdir import (BzrDir, BzrDirFormat, BzrDirMetaFormat1)
25
28
from bzrlib.osutils import getcwd
100
103
        self.run_bzr('unbind', retcode=3)
101
104
 
102
105
    def init_meta_branch(self, path):
103
 
        old_format = BzrDirFormat.get_default_format()
104
 
        BzrDirFormat.set_default_format(BzrDirMetaFormat1())
105
 
        try:
106
 
            return BzrDir.create_branch_convenience(
107
 
                path, BzrDirMetaFormat1())
108
 
        finally:
109
 
            BzrDirFormat.set_default_format(old_format)
 
106
        format = bzrdir.format_registry.make_bzrdir('knit')
 
107
        return BzrDir.create_branch_convenience(path, format=format)
110
108
 
111
109
    def test_bound_commit(self):
112
110
        bzr = self.run_bzr