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

  • Committer: Jelmer Vernooij
  • Date: 2020-08-10 15:00:17 UTC
  • mfrom: (7490.40.99 work)
  • mto: This revision was merged to the branch mainline in revision 7521.
  • Revision ID: jelmer@jelmer.uk-20200810150017-vs7xnrd1vat4iktg
Merge lp:brz/3.1.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_merge.py
33
33
    knit,
34
34
    versionedfile,
35
35
    )
36
 
from ..conflicts import ConflictList, TextConflict
 
36
from ..conflicts import ConflictList
 
37
from ..bzr.conflicts import TextConflict, MissingParent, UnversionedParent, DeletingParent, ContentsConflict
37
38
from ..errors import UnrelatedBranches, NoCommits
38
39
from ..merge import transform_tree, merge_inner, _PlanMerge
39
40
from ..osutils import basename, pathjoin, file_kind
134
135
                                         this_branch=wt.branch,
135
136
                                         do_merge=False)
136
137
        with merger.make_preview_transform() as tt:
137
 
            self.assertEqual([], tt.find_conflicts())
 
138
            self.assertEqual([], tt.find_raw_conflicts())
138
139
            preview = tt.get_preview_tree()
139
140
            self.assertEqual(wt.path2id(''), preview.path2id(''))
140
141
 
197
198
 
198
199
    def test_merge_inner_conflicts(self):
199
200
        tree_a = self.make_branch_and_tree('a')
200
 
        tree_a.set_conflicts(ConflictList([TextConflict('patha')]))
 
201
        tree_a.set_conflicts([TextConflict('patha')])
201
202
        merge_inner(tree_a.branch, tree_a, tree_a, this_tree=tree_a)
202
203
        self.assertEqual(1, len(tree_a.conflicts()))
203
204
 
219
220
        tree_z.commit('removed b')
220
221
        merge_inner(tree_z.branch, tree_a, base_tree, this_tree=tree_z)
221
222
        self.assertEqual([
222
 
            conflicts.MissingParent('Created directory', 'b', b'b-id'),
223
 
            conflicts.UnversionedParent('Versioned directory', 'b', b'b-id')],
 
223
            MissingParent('Created directory', 'b', b'b-id'),
 
224
            UnversionedParent('Versioned directory', 'b', b'b-id')],
224
225
            tree_z.conflicts())
225
226
        merge_inner(tree_a.branch, tree_z.basis_tree(), base_tree,
226
227
                    this_tree=tree_a)
227
228
        self.assertEqual([
228
 
            conflicts.DeletingParent('Not deleting', 'b', b'b-id'),
229
 
            conflicts.UnversionedParent('Versioned directory', 'b', b'b-id')],
 
229
            DeletingParent('Not deleting', 'b', b'b-id'),
 
230
            UnversionedParent('Versioned directory', 'b', b'b-id')],
230
231
            tree_a.conflicts())
231
232
 
232
233
    def test_nested_merge(self):
287
288
        tree_b.commit('content change')
288
289
        tree_b.merge_from_branch(tree_a.branch)
289
290
        self.assertEqual(tree_b.conflicts(),
290
 
                         [conflicts.ContentsConflict('file',
291
 
                                                     file_id=b'file-id')])
 
291
                         [ContentsConflict('file', file_id=b'file-id')])
292
292
 
293
293
    def test_merge_type_registry(self):
294
294
        merge_type_option = option.Option.OPTIONS['merge-type']