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

  • Committer: Jelmer Vernooij
  • Date: 2018-07-08 15:47:10 UTC
  • mto: This revision was merged to the branch mainline in revision 7036.
  • Revision ID: jelmer@jelmer.uk-20180708154710-zebexq602tcer8hv
Fix more merge tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
115
115
        copy = tree.controldir.sprout('copyoftree').open_workingtree()
116
116
        copy.commit(message='merged', rev_id=b'merged')
117
117
        tree.merge_from_branch(copy.branch)
118
 
        tree.branch.tags.set_tag('pointsatmerged', 'merged')
 
118
        tree.branch.tags.set_tag('pointsatmerged', b'merged')
119
119
        history.append(tree.commit('merge'))
120
 
        self.assertEqual('merged', tree.branch.tags.lookup_tag('pointsatmerged'))
 
120
        self.assertEqual(b'merged', tree.branch.tags.lookup_tag('pointsatmerged'))
121
121
        self.assertEqual(history[2], tree.last_revision())
122
122
        self.assertEqual((3, history[2]), tree.branch.last_revision_info())
123
123
        tree.branch.tags.set_tag(u"pointsatexisting", history[1])
125
125
        uncommit.uncommit(tree.branch, tree=tree)
126
126
        self.assertEqual(history[1], tree.last_revision())
127
127
        self.assertEqual((2, history[1]), tree.branch.last_revision_info())
128
 
        self.assertEqual([history[1], 'merged'], tree.get_parent_ids())
 
128
        self.assertEqual([history[1], b'merged'], tree.get_parent_ids())
129
129
        self.assertEqual({
130
130
            "pointsatexisting": history[1],
131
 
            "pointsatmerged": 'merged',
 
131
            "pointsatmerged": b'merged',
132
132
            }, tree.branch.tags.get_tag_dict())
133
133
 
134
134
    def test_uncommit_keep_tags(self):