← 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

  • Committer: John Arbash Meinel
  • Date: 2006-12-01 19:41:16 UTC
  • mfrom: (2158 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2159.
  • Revision ID: john@arbash-meinel.com-20061201194116-nvn5qhfxux5284jc
[merge] bzr.dev 2158

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