/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-05-06 11:48:54 UTC
  • mto: This revision was merged to the branch mainline in revision 6960.
  • Revision ID: jelmer@jelmer.uk-20180506114854-h4qd9ojaqy8wxjsd
Move .mailmap to root.

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(
66
 
                            [base_rev, b'y@u-0-1', b'y@u-0-2'])
67
 
                        )
68
 
        rev = by.repository.get_revision(b'y@u-0-2')
 
65
            RevisionHistoryMatches([base_rev, 'y@u-0-1', 'y@u-0-2'])
 
66
            )
 
67
        rev = by.repository.get_revision('y@u-0-2')
69
68
        self.assertEqual(rev.parent_ids,
70
 
                         [b'y@u-0-1', b'x@u-0-1'])
 
69
                          ['y@u-0-1', 'x@u-0-1'])
71
70
 
72
71
    def test_merge_new_file(self):
73
72
        """Commit merge of two trees with no overlapping files."""
76
75
        bx = wtx.branch
77
76
        wtx.commit('establish root id')
78
77
        wty = wtx.controldir.sprout('y').open_workingtree()
79
 
        self.assertEqual(wtx.path2id(''), wty.path2id(''))
 
78
        self.assertEqual(wtx.get_root_id(), wty.get_root_id())
80
79
        by = wty.branch
81
80
 
82
81
        self.build_tree(['x/ecks', 'y/why'])