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

  • Committer: Jelmer Vernooij
  • Date: 2018-11-06 01:18:08 UTC
  • mfrom: (7143 work)
  • mto: This revision was merged to the branch mainline in revision 7151.
  • Revision ID: jelmer@jelmer.uk-20181106011808-y870f4vq0ork3ahu
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_commit_merge.py
62
62
        graph = wty.branch.repository.get_graph()
63
63
        self.addCleanup(wty.lock_read().unlock)
64
64
        self.assertThat(by,
65
 
            RevisionHistoryMatches([base_rev, 'y@u-0-1', 'y@u-0-2'])
 
65
            RevisionHistoryMatches([base_rev, b'y@u-0-1', b'y@u-0-2'])
66
66
            )
67
 
        rev = by.repository.get_revision('y@u-0-2')
 
67
        rev = by.repository.get_revision(b'y@u-0-2')
68
68
        self.assertEqual(rev.parent_ids,
69
 
                          ['y@u-0-1', 'x@u-0-1'])
 
69
                          [b'y@u-0-1', b'x@u-0-1'])
70
70
 
71
71
    def test_merge_new_file(self):
72
72
        """Commit merge of two trees with no overlapping files."""