← 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-06-15 11:36:05 UTC
  • mto: This revision was merged to the branch mainline in revision 5975.
  • Revision ID: v.ladeuil+lp@free.fr-20110615113605-p7zyyfry9wy1hquc
https://launchpad.net/bugs/788000
Make ContentConflict resolution more robust

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 TestCaseWithTransport
28
 
from bzrlib.tests.features import (
29
 
    OsFifoFeature,
30
 
    )
 
27
from bzrlib.tests import OsFifoFeature, TestCaseWithTransport
31
28
 
32
29
 
33
30
def verify_status(tester, tree, value):