/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_conflicts.py

  • Committer: Jelmer Vernooij
  • Date: 2018-06-21 23:03:42 UTC
  • mto: This revision was merged to the branch mainline in revision 6996.
  • Revision ID: jelmer@jelmer.uk-20180621230342-yl9vbifwc2x4ltvt
Avoid text_type()

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_conflicts.py
304
304
 
305
305
        # Create an empty trunk
306
306
        builder.build_snapshot(None, [
307
 
                ('add', ('', 'root-id', 'directory', ''))],
 
307
                ('add', (u'', b'root-id', 'directory', ''))],
308
308
                revision_id=b'start')
309
309
        # Add a minimal base content
310
310
        base_actions = self._get_actions(self._base_actions)()
311
 
        builder.build_snapshot(['start'], base_actions, revision_id=b'base')
 
311
        builder.build_snapshot([b'start'], base_actions, revision_id=b'base')
312
312
        # Modify the base content in branch
313
313
        actions_other = self._get_actions(self._other['actions'])()
314
 
        builder.build_snapshot(['base'], actions_other, revision_id=b'other')
 
314
        builder.build_snapshot([b'base'], actions_other, revision_id=b'other')
315
315
        # Modify the base content in trunk
316
316
        actions_this = self._get_actions(self._this['actions'])()
317
 
        builder.build_snapshot(['base'], actions_this, revision_id=b'this')
 
317
        builder.build_snapshot([b'base'], actions_this, revision_id=b'this')
318
318
        # builder.get_branch() tip is now 'this'
319
319
 
320
320
        builder.finish_series()