← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/tree_implementations/__init__.py

  • Committer: Martin Pool
  • Date: 2007-10-10 00:21:57 UTC
  • mfrom: (2900 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2901.
  • Revision ID: mbp@sourcefrog.net-20071010002157-utci0x44m2w47wgd
merge news

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)