/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 breezy/tests/per_intertree/__init__.py

  • Committer: Jelmer Vernooij
  • Date: 2017-06-08 23:30:31 UTC
  • mto: This revision was merged to the branch mainline in revision 6690.
  • Revision ID: jelmer@jelmer.uk-20170608233031-3qavls2o7a1pqllj
Update imports.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/per_intertree/__init__.py
38
38
    TestCaseWithTree,
39
39
    )
40
40
from breezy.tree import InterTree
41
 
from breezy.workingtree_3 import WorkingTreeFormat3
42
 
from breezy.workingtree_4 import WorkingTreeFormat4
 
41
from breezy.bzr.workingtree_3 import WorkingTreeFormat3
 
42
from breezy.bzr.workingtree_4 import WorkingTreeFormat4
43
43
 
44
44
 
45
45
def return_provided_trees(test_case, source, target):
142
142
                 chk_tree_format,
143
143
                 chk_tree_format,
144
144
                 mutable_trees_to_revision_trees))
145
 
        elif optimiser is breezy.workingtree_4.InterDirStateTree:
 
145
        elif optimiser is breezy.bzr.workingtree_4.InterDirStateTree:
146
146
            # Its a little ugly to be conditional here, but less so than having
147
147
            # the optimiser listed twice.
148
148
            # Add once, compiled version