/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 17:53:38 UTC
  • mfrom: (6973.5.13 python3-c)
  • Revision ID: jelmer@jelmer.uk-20180621175338-v7loaib7mh7pfosf
Merge lp:~jelmer/brz/python3-c

Show diffs side-by-side

added added

removed removed

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