/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

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

  • Committer: John Arbash Meinel
  • Date: 2010-09-25 20:08:01 UTC
  • mfrom: (5444 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5445.
  • Revision ID: john@arbash-meinel.com-20100925200801-7uf0ux3uwxo9i3x0
Merge bzr.dev 5444 to resolve some small text conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_tree/__init__.py
27
27
 
28
28
from bzrlib import (
29
29
    errors,
30
 
    osutils,
31
 
    progress,
32
30
    tests,
33
31
    transform,
34
32
    )
35
 
from bzrlib.tests.per_bzrdir.test_bzrdir import TestCaseWithBzrDir
 
33
from bzrlib.tests.per_controldir.test_controldir import TestCaseWithControlDir
36
34
from bzrlib.tests.per_workingtree import (
37
35
    make_scenarios as wt_make_scenarios,
38
36
    make_scenario as wt_make_scenario,
39
37
    )
40
 
from bzrlib.revision import NULL_REVISION
41
38
from bzrlib.revisiontree import RevisionTree
42
39
from bzrlib.transform import TransformPreview
43
40
from bzrlib.workingtree import (
44
41
    WorkingTreeFormat,
45
 
    WorkingTreeFormat3,
46
42
    _legacy_formats,
47
43
    )
48
44
from bzrlib.workingtree_4 import (
98
94
        self.assertIsInstance(tree, RevisionTree)
99
95
 
100
96
 
101
 
class TestCaseWithTree(TestCaseWithBzrDir):
 
97
class TestCaseWithTree(TestCaseWithControlDir):
102
98
 
103
99
    def make_branch_and_tree(self, relpath):
104
100
        made_control = self.make_bzrdir(relpath, format=