/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: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-03-25 11:54:30 UTC
  • mfrom: (6855.4.10 more-bees)
  • Revision ID: breezy.the.bot@gmail.com-20180325115430-75xnlbrmzjoomd83
Add more bees. In particular:

* for file ids
* for revision ids
* for file contents in build_tree_contents()

Merged from https://code.launchpad.net/~jelmer/brz/more-bees/+merge/337919

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_uncommit.py
113
113
    def test_uncommit_remove_tags_keeps_pending_merges(self):
114
114
        tree, history = self.make_linear_tree()
115
115
        copy = tree.controldir.sprout('copyoftree').open_workingtree()
116
 
        copy.commit(message='merged', rev_id='merged')
 
116
        copy.commit(message='merged', rev_id=b'merged')
117
117
        tree.merge_from_branch(copy.branch)
118
118
        tree.branch.tags.set_tag('pointsatmerged', 'merged')
119
119
        history.append(tree.commit('merge'))