/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

  • Committer: Robert Collins
  • Date: 2007-03-07 01:14:11 UTC
  • mfrom: (2321 +trunk)
  • mto: (2321.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 2322.
  • Revision ID: robertc@robertcollins.net-20070307011411-0cmmc8atx67v3nv7
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/tree_implementations/__init__.py
27
27
 
28
28
from bzrlib import (
29
29
    errors,
 
30
    osutils,
30
31
    tests,
31
32
    transform,
32
33
    )
229
230
                ]
230
231
        # bzr itself does not create unicode file ids, but we want them for
231
232
        # testing.
232
 
        file_ids = [u'TREE_ROOT',
233
 
                    u'f\xf6-id'.encode('utf8'),
234
 
                    u'b\xe5r-id'.encode('utf8'),
235
 
                    u'b\xe1z-id'.encode('utf8'),
 
233
        file_ids = ['TREE_ROOT',
 
234
                    'f\xc3\xb6-id',
 
235
                    'b\xc3\xa5r-id',
 
236
                    'b\xc3\xa1z-id',
236
237
                   ]
237
238
        try:
238
239
            self.build_tree(paths[1:])
255
256
        self._create_tree_with_utf8(tree)
256
257
        tree2 = tree.bzrdir.sprout('tree2').open_workingtree()
257
258
        self.build_tree([u'tree2/b\xe5r/z\xf7z'])
258
 
        tree2.add([u'b\xe5r/z\xf7z'], [u'z\xf7z-id'.encode('utf8')])
 
259
        self.callDeprecated([osutils._file_id_warning],
 
260
                            tree2.add, [u'b\xe5r/z\xf7z'], [u'z\xf7z-id'])
259
261
        tree2.commit(u'to m\xe9rge', rev_id=u'r\xe9v-2'.encode('utf8'))
260
262
 
261
263
        tree.merge_from_branch(tree2.branch)