/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/blackbox/test_merge.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/blackbox/test_merge.py
688
688
        target_bzrdir = source.controldir.sprout('target')
689
689
        # Add a non-ancestry tag to source
690
690
        builder.build_commit(message="Rev 2a", rev_id=b'rev-2a')
691
 
        source.tags.set_tag('tag-a', 'rev-2a')
692
 
        source.set_last_revision_info(1, 'rev-1')
 
691
        source.tags.set_tag('tag-a', b'rev-2a')
 
692
        source.set_last_revision_info(1, b'rev-1')
693
693
        source.get_config_stack().set('branch.fetch_tags', True)
694
694
        builder.build_commit(message="Rev 2b", rev_id=b'rev-2b')
695
695
        # Merge from source
696
696
        self.run_bzr('merge -d target source')
697
697
        target = target_bzrdir.open_branch()
698
698
        # The tag is present, and so is its revision.
699
 
        self.assertEqual('rev-2a', target.tags.lookup_tag('tag-a'))
700
 
        target.repository.get_revision('rev-2a')
 
699
        self.assertEqual(b'rev-2a', target.tags.lookup_tag('tag-a'))
 
700
        target.repository.get_revision(b'rev-2a')
701
701
 
702
702
 
703
703
class TestMergeRevisionRange(tests.TestCaseWithTransport):