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

  • Committer: Jelmer Vernooij
  • Date: 2018-11-17 00:47:52 UTC
  • mfrom: (7182 work)
  • mto: This revision was merged to the branch mainline in revision 7305.
  • Revision ID: jelmer@jelmer.uk-20181117004752-6ywampe5pfywlby4
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_subsume.py
34
34
        base_tree.add('file', b'file-id')
35
35
        base_tree.commit('first commit', rev_id=b'tree-1')
36
36
        sub_tree = self.make_branch_and_tree('tree/subtree',
37
 
            format='development-subtree')
 
37
                                             format='development-subtree')
38
38
        if same_root is True:
39
39
            sub_tree.set_root_id(base_tree.get_root_id())
40
40
        sub_tree.add('file2', b'file2-id')
90
90
        self.assertEqual(b'subtree-1',
91
91
                         basis_tree.get_file_revision('subtree/file2'))
92
92
        self.assertEqual(b'combined-1',
93
 
                         basis_tree.get_file_revision('subtree', sub_root_id))
 
93
                         basis_tree.get_file_revision('subtree'))
94
94
 
95
95
    def test_subsume_failure(self):
96
96
        base_tree, sub_tree = self.make_trees()
97
97
        if base_tree.get_root_id() == sub_tree.get_root_id():
98
98
            raise tests.TestSkipped('This test requires unique roots')
99
 
        sub_root_id = sub_tree.get_root_id()
100
99
        self.assertRaises(errors.BadSubsumeSource, base_tree.subsume,
101
100
                          base_tree)
102
101
        self.assertRaises(errors.BadSubsumeSource, sub_tree.subsume,