← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_conflicts.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_conflicts.py
19
19
    tests,
20
20
    workingtree,
21
21
    )
22
 
from bzrlib.tests import script, UnicodeFilenameFeature
 
22
from bzrlib.tests import script, features
23
23
 
24
24
 
25
25
def make_tree_with_conflicts(test, this_path='this', other_path='other',
86
86
class TestUnicodePaths(tests.TestCaseWithTransport):
87
87
    """Unicode characters in conflicts should be displayed properly"""
88
88
 
89
 
    _test_needs_features = [UnicodeFilenameFeature]
 
89
    _test_needs_features = [features.UnicodeFilenameFeature]
90
90
    encoding = "UTF-8"
91
91
 
92
92
    def _as_output(self, text):