← 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

  • Committer: Robert Collins
  • Date: 2006-05-05 00:44:25 UTC
  • mfrom: (1697 +trunk)
  • mto: (1697.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 1701.
  • Revision ID: robertc@robertcollins.net-20060505004425-55597abf11998087
Merge HEAD.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_bound_branches.py
23
23
 
24
24
from bzrlib.tests import TestCaseWithTransport
25
25
from bzrlib.branch import Branch
26
 
from bzrlib.bzrdir import (BzrDir,
27
 
                           BzrDirFormat,
28
 
                           BzrDirFormat6,
29
 
                           BzrDirMetaFormat1,
30
 
                           )
 
26
from bzrlib.bzrdir import (BzrDir, BzrDirFormat, BzrDirMetaFormat1)
31
27
from bzrlib.osutils import getcwd
32
28
from bzrlib.workingtree import WorkingTree
33
29
 
38
34
        super(TestLegacyFormats, self).setUp()
39
35
        self.build_tree(['master/', 'child/'])
40
36
        self.run_bzr('init', 'master')
41
 
        old_format = BzrDirFormat.get_default_format()
42
 
        BzrDirFormat.set_default_format(BzrDirFormat6())
43
 
        try:
44
 
            self.run_bzr('init', 'child')
45
 
        finally:
46
 
            BzrDirFormat.set_default_format(old_format)
 
37
        self.run_bzr('init', '--format=weave', 'child')
47
38
        os.chdir('child')
48
39
    
49
40
    def test_bind_format_6_bzrdir(self):