/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/branch_implementations/test_http.py

  • Committer: Robert Collins
  • Date: 2008-01-03 21:02:06 UTC
  • mfrom: (3162 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3163.
  • Revision ID: robertc@robertcollins.net-20080103210206-eqvta89m37jgjjfi
Resolve conflicts with bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/branch_implementations/test_http.py
20
20
 
21
21
from bzrlib import branch, errors
22
22
from bzrlib.tests.branch_implementations.test_branch import TestCaseWithBranch
23
 
from bzrlib.tests.HttpServer import HttpServer
 
23
from bzrlib.tests.http_server import HttpServer
24
24
from bzrlib.transport.local import LocalURLServer
25
25
from bzrlib.transport.chroot import TestingChrootServer
26
26