/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 breezy/transport/chroot.py

  • Committer: Jelmer Vernooij
  • Date: 2018-07-08 14:45:27 UTC
  • mto: This revision was merged to the branch mainline in revision 7036.
  • Revision ID: jelmer@jelmer.uk-20180708144527-codhlvdcdg9y0nji
Fix a bunch of merge tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/transport/chroot.py
18
18
root.
19
19
"""
20
20
 
21
 
from bzrlib.transport import (
 
21
from __future__ import absolute_import
 
22
 
 
23
from . import (
22
24
    pathfilter,
23
25
    register_transport,
24
26
    )
63
65
 
64
66
def get_test_permutations():
65
67
    """Return the permutations to be used in testing."""
66
 
    from bzrlib.tests import test_server
 
68
    from breezy.tests import test_server
67
69
    return [(ChrootTransport, test_server.TestingChrootServer)]