← 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: Tarmac
  • Author(s): Vincent Ladeuil, Patch Queue Manager, Jelmer Vernooij
  • Date: 2017-01-17 16:20:41 UTC
  • mfrom: (6619.1.2 trunk)
  • Revision ID: tarmac-20170117162041-oo62uk1qsmgc9j31
Merge 2.7 into trunk including fixes for bugs #1622039, #1644003, #1579093 and #1645017. [r=vila]

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):