← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_bad_files.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/test_bad_files.py
24
24
    errors,
25
25
    )
26
26
from bzrlib.status import show_tree_status
27
 
from bzrlib.tests import OsFifoFeature, TestCaseWithTransport
 
27
from bzrlib.tests import TestCaseWithTransport
 
28
from bzrlib.tests.features import (
 
29
    OsFifoFeature,
 
30
    )
28
31
 
29
32
 
30
33
def verify_status(tester, tree, value):