~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_workingtree.py

  • Committer: Martin Pool
  • Date: 2010-08-13 07:56:06 UTC
  • mfrom: (5050.17.4 2.2)
  • mto: (5050.17.6 2.2)
  • mto: This revision was merged to the branch mainline in revision 5379.
  • Revision ID: mbp@sourcefrog.net-20100813075606-8zgmov3ezwans2zo
merge bzr 2.2

Show diffs side-by-side

added added

removed removed

Lines of Context:
22
22
    bzrdir,
23
23
    conflicts,
24
24
    errors,
 
25
    transport,
25
26
    workingtree,
26
27
    )
27
28
from bzrlib.branch import Branch
29
30
from bzrlib.lockdir import LockDir
30
31
from bzrlib.mutabletree import needs_tree_write_lock
31
32
from bzrlib.tests import TestCase, TestCaseWithTransport, TestSkipped
32
 
from bzrlib.transport import get_transport
33
33
from bzrlib.workingtree import (
34
34
    TreeEntry,
35
35
    TreeDirectory,
138
138
            dir.create_repository()
139
139
            dir.create_branch()
140
140
            format.initialize(dir)
141
 
            t = get_transport(url)
 
141
            t = transport.get_transport(url)
142
142
            found_format = workingtree.WorkingTreeFormat.find_format(dir)
143
143
            self.failUnless(isinstance(found_format, format.__class__))
144
144
        check_format(workingtree.WorkingTreeFormat3(), "bar")