/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/blackbox/test_merge.py

  • Committer: Jelmer Vernooij
  • Date: 2020-07-05 12:50:01 UTC
  • mfrom: (7490.40.46 work)
  • mto: (7490.40.48 work)
  • mto: This revision was merged to the branch mainline in revision 7519.
  • Revision ID: jelmer@jelmer.uk-20200705125001-7s3vo0p55szbbws7
Merge lp:brz/3.1.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_merge.py
26
26
 
27
27
from breezy import (
28
28
    branch,
 
29
    conflicts,
29
30
    controldir,
30
31
    merge_directive,
31
32
    osutils,
33
34
    urlutils,
34
35
    workingtree,
35
36
    )
36
 
from breezy.bzr import (
37
 
    conflicts,
38
 
    )
39
37
from breezy.tests import (
40
38
    scenarios,
41
39
    script,
330
328
                                              tree_b.get_parent_ids()[0])
331
329
        self.assertEqualDiff(testament_a.as_text(),
332
330
                             testament_b.as_text())
333
 
        tree_a.set_conflicts([])
 
331
        tree_a.set_conflicts(conflicts.ConflictList())
334
332
        tree_a.commit('message')
335
333
        # it is legal to attempt to merge an already-merged bundle
336
334
        err = self.run_bzr('merge ../bundle', working_dir='branch_a')[1]
429
427
        tree_b.commit('content change')
430
428
        self.run_bzr('merge ../tree_a', retcode=1, working_dir='tree_b')
431
429
        self.assertEqual(tree_b.conflicts(),
432
 
                         [conflicts.ContentsConflict('file', file_id='file-id')])
 
430
                         [conflicts.ContentsConflict('file',
 
431
                                                     file_id='file-id')])
433
432
 
434
433
    def test_directive_cherrypick(self):
435
434
        source = self.make_branch_and_tree('source')
633
632
        tree_a.merge_from_branch(tree_b.branch)
634
633
        self.build_tree_contents([('a/file',
635
634
                                   b'base-contents\nthis-contents\n')])
636
 
        tree_a.set_conflicts([])
 
635
        tree_a.set_conflicts(conflicts.ConflictList())
637
636
        tree_b.merge_from_branch(tree_a.branch)
638
637
        self.build_tree_contents([('b/file',
639
638
                                   b'base-contents\nother-contents\n')])
640
 
        tree_b.set_conflicts([])
 
639
        tree_b.set_conflicts(conflicts.ConflictList())
641
640
        tree_a.commit('', rev_id=b'rev3a')
642
641
        tree_b.commit('', rev_id=b'rev3b')
643
642
        out, err = self.run_bzr(['merge', '-d', 'a', 'b', '--lca'], retcode=1)