/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/blackbox/test_filesystem_cicp.py

  • Committer: Vincent Ladeuil
  • Date: 2011-11-24 15:48:29 UTC
  • mfrom: (6289 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6337.
  • Revision ID: v.ladeuil+lp@free.fr-20111124154829-avowjpsxdl8yp2vz
merge trunk resolving conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_filesystem_cicp.py
23
23
    osutils,
24
24
    tests,
25
25
    )
26
 
from bzrlib.tests import CaseInsCasePresFilenameFeature, KnownFailure
 
26
from bzrlib.tests import KnownFailure
27
27
from bzrlib.osutils import canonical_relpath, pathjoin
28
28
from bzrlib.tests.script import run_script
 
29
from bzrlib.tests.features import (
 
30
    CaseInsCasePresFilenameFeature,
 
31
    )
 
32
 
29
33
 
30
34
 
31
35
class TestCICPBase(tests.TestCaseWithTransport):