← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_serve.py

Merge from bzr.dev, resolving conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_serve.py
30
30
from bzrlib.branch import Branch
31
31
from bzrlib.bzrdir import BzrDir
32
32
from bzrlib.errors import ParamikoNotPresent
 
33
from bzrlib.smart import medium
33
34
from bzrlib.tests import TestCaseWithTransport, TestSkipped
34
35
from bzrlib.transport import get_transport, remote
35
 
from bzrlib.smart import medium
36
36
 
37
37
 
38
38
class TestBzrServe(TestCaseWithTransport):