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

  • Committer: Jelmer Vernooij
  • Date: 2018-05-22 02:05:12 UTC
  • mto: (6973.12.2 python3-k)
  • mto: This revision was merged to the branch mainline in revision 6992.
  • Revision ID: jelmer@jelmer.uk-20180522020512-btpj2jchdlehi3en
Add more bees.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_merge_directive.py
278
278
 
279
279
    def make_merge_directive(self, revision_id, testament_sha1, time, timezone,
280
280
                 target_branch, patch=None, patch_type=None,
281
 
                 source_branch=None, message=None, base_revision_id='null:'):
 
281
                 source_branch=None, message=None, base_revision_id=b'null:'):
282
282
        if patch_type == 'bundle':
283
283
            bundle = patch
284
284
            patch = None
639
639
 
640
640
    def make_merge_directive(self, revision_id, testament_sha1, time, timezone,
641
641
                 target_branch, patch=None, patch_type=None,
642
 
                 source_branch=None, message=None, base_revision_id='null:'):
 
642
                 source_branch=None, message=None, base_revision_id=b'null:'):
643
643
        if patch_type == 'bundle':
644
644
            bundle = patch
645
645
            patch = None
657
657
        self.assertEqual(b'rev1', md.base_revision_id)
658
658
        md = self.from_objects(tree_a.branch.repository, b'rev2a', 500, 60,
659
659
            tree_b.branch.base, patch_type='bundle',
660
 
            public_branch=tree_a.branch.base, base_revision_id='null:')
 
660
            public_branch=tree_a.branch.base, base_revision_id=b'null:')
661
661
        self.assertEqual('null:', md.base_revision_id)
662
662
        lines = md.to_lines()
663
663
        md2 = merge_directive.MergeDirective.from_lines(lines)