/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/tree_implementations/__init__.py

Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/tree_implementations/__init__.py
279
279
        self._create_tree_with_utf8(tree)
280
280
        tree2 = tree.bzrdir.sprout('tree2').open_workingtree()
281
281
        self.build_tree([u'tree2/b\xe5r/z\xf7z'])
282
 
        self.callDeprecated([osutils._file_id_warning],
283
 
                            tree2.add, [u'b\xe5r/z\xf7z'], [u'z\xf7z-id'])
 
282
        tree2.add([u'b\xe5r/z\xf7z'], [u'z\xf7z-id'.encode('utf-8')])
284
283
        tree2.commit(u'to m\xe9rge', rev_id=u'r\xe9v-2'.encode('utf8'))
285
284
 
286
285
        tree.merge_from_branch(tree2.branch)
327
326
        'bzrlib.tests.tree_implementations.test_get_symlink_target',
328
327
        'bzrlib.tests.tree_implementations.test_inv',
329
328
        'bzrlib.tests.tree_implementations.test_list_files',
 
329
        'bzrlib.tests.tree_implementations.test_path_content_summary',
330
330
        'bzrlib.tests.tree_implementations.test_revision_tree',
331
331
        'bzrlib.tests.tree_implementations.test_test_trees',
332
332
        'bzrlib.tests.tree_implementations.test_tree',