← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/branch_implementations/test_branch.py

Merge integration and knit-index utf8 decoding fixes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/branch_implementations/test_branch.py
40
40
import bzrlib.revision
41
41
from bzrlib.tests import TestCase, TestCaseWithTransport, TestSkipped
42
42
from bzrlib.tests.bzrdir_implementations.test_bzrdir import TestCaseWithBzrDir
 
43
from bzrlib.tests.HttpServer import HttpServer
43
44
from bzrlib.trace import mutter
44
45
from bzrlib.transport import get_transport
45
 
from bzrlib.transport.http import HttpServer
46
46
from bzrlib.transport.memory import MemoryServer
47
47
from bzrlib.upgrade import upgrade
48
48
from bzrlib.workingtree import WorkingTree