/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 breezy/tests/test_upstream_import.py

  • Committer: Jelmer Vernooij
  • Date: 2018-07-13 00:42:16 UTC
  • mfrom: (7027.3.8 python3-n)
  • mto: This revision was merged to the branch mainline in revision 7039.
  • Revision ID: jelmer@jelmer.uk-20180713004216-p2cv2oxlrb7wg4l0
merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_upstream_import.py
289
289
        b = self.make_repository('foo')
290
290
        null_tree = b.revision_tree(_mod_revision.NULL_REVISION)
291
291
        tt = transform.TransformPreview(null_tree)
292
 
        root = tt.new_directory('', transform.ROOT_PARENT, 'tree-root')
 
292
        root = tt.new_directory('', transform.ROOT_PARENT, b'tree-root')
293
293
        tt.fixup_new_roots()
294
294
        self.addCleanup(tt.finalize)
295
295
        return tt
298
298
        self.requireFeature(UnicodeFilenameFeature)
299
299
        tt = self.get_empty_tt()
300
300
        encoded_file = tt.new_file(
301
 
            u'\u1234file', tt.root, 'contents', 'new-file')
 
301
            u'\u1234file', tt.root, [b'contents'], b'new-file')
302
302
        encoded_file = tt.new_file(
303
 
            'other', tt.root, 'contents', 'other-file')
 
303
            'other', tt.root, [b'contents'], b'other-file')
304
304
        tarfile = self.transform_to_tar(tt)
305
305
        tarfile.seek(0)
306
306
        tree = self.make_branch_and_tree('bar')