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

  • Committer: Jelmer Vernooij
  • Date: 2018-07-07 19:27:38 UTC
  • mto: (7027.4.10 python3-blackbox)
  • mto: This revision was merged to the branch mainline in revision 7038.
  • Revision ID: jelmer@jelmer.uk-20180707192738-cbt5f28lbd3lx4td
Add some more bees; support writing both bytes and unicode strings in build_tree_contents.

Show diffs side-by-side

added added

removed removed

Lines of Context:
62
62
    br2 = tree2.branch
63
63
    tree2.commit("Commit four", rev_id=b"b@u-0-3")
64
64
    tree2.commit("Commit five", rev_id=b"b@u-0-4")
65
 
    self.assertEqual(br2.last_revision(), 'b@u-0-4')
 
65
    self.assertEqual(br2.last_revision(), b'b@u-0-4')
66
66
 
67
67
    tree1.merge_from_branch(br2)
68
68
    tree1.commit("Commit six", rev_id=b"a@u-0-3")
69
69
    tree1.commit("Commit seven", rev_id=b"a@u-0-4")
70
70
    tree2.commit("Commit eight", rev_id=b"b@u-0-5")
71
 
    self.assertEqual(br2.last_revision(), 'b@u-0-5')
 
71
    self.assertEqual(br2.last_revision(), b'b@u-0-5')
72
72
 
73
73
    tree1.merge_from_branch(br2)
74
74
    tree1.commit("Commit nine", rev_id=b"a@u-0-5")