/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: 2019-06-02 02:35:46 UTC
  • mfrom: (7309 work)
  • mto: This revision was merged to the branch mainline in revision 7319.
  • Revision ID: jelmer@jelmer.uk-20190602023546-lqco868tnv26d8ow
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, b'y@u-0-1', b'y@u-0-2'])
66
 
            )
 
65
                        RevisionHistoryMatches(
 
66
                            [base_rev, b'y@u-0-1', b'y@u-0-2'])
 
67
                        )
67
68
        rev = by.repository.get_revision(b'y@u-0-2')
68
69
        self.assertEqual(rev.parent_ids,
69
 
                          [b'y@u-0-1', b'x@u-0-1'])
 
70
                         [b'y@u-0-1', b'x@u-0-1'])
70
71
 
71
72
    def test_merge_new_file(self):
72
73
        """Commit merge of two trees with no overlapping files."""