← Back to branch summary

~jelmer/brz/tree-reference-fixes

« back to all changes in this revision

Viewing changes to breezy/tests/per_bzrdir/test_bzrdir.py

  • Committer: Jelmer Vernooij
  • Date: 2018-03-25 12:47:13 UTC
  • mfrom: (6926.1.2 work)
  • Revision ID: jelmer@jelmer.uk-20180325124713-dq64vm9bhch1gjow
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/per_bzrdir/test_bzrdir.py
232
232
        tree = self.make_branch_and_tree('commit_tree')
233
233
        self.build_tree(['commit_tree/foo'])
234
234
        tree.add('foo')
235
 
        tree.commit('revision 1', rev_id='1')
 
235
        tree.commit('revision 1', rev_id=b'1')
236
236
        dir = self.make_controldir('source')
237
237
        repo = dir.create_repository()
238
238
        repo.fetch(tree.branch.repository)
298
298
        tree = self.make_branch_and_tree('commit_tree')
299
299
        self.build_tree(['foo'], transport=tree.controldir.transport.clone('..'))
300
300
        tree.add('foo')
301
 
        tree.commit('revision 1', rev_id='1')
 
301
        tree.commit('revision 1', rev_id=b'1')
302
302
        dir = self.make_controldir('source')
303
303
        repo = dir.create_repository()
304
304
        repo.fetch(tree.branch.repository)
426
426
        tree = self.make_branch_and_tree('commit_tree')
427
427
        self.build_tree(['foo'], transport=tree.controldir.transport.clone('..'))
428
428
        tree.add('foo')
429
 
        tree.commit('revision 1', rev_id='1')
 
429
        tree.commit('revision 1', rev_id=b'1')
430
430
        dir = self.make_controldir('source')
431
431
        repo = dir.create_repository()
432
432
        repo.fetch(tree.branch.repository)