/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_resolve.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/blackbox/test_resolve.py
18
18
    conflicts,
19
19
    tests,
20
20
    )
 
21
from breezy.bzr import conflicts as _mod_bzr_conflicts
21
22
from breezy.tests import (
22
23
    script,
23
24
    KnownFailure,
178
179
                                   b'<<<<<<<\na\n=======\n>>>>>>>\n')])
179
180
        tree.add('file', b'file_id')
180
181
        self.assertEqual(tree.kind('file'), 'file')
181
 
        file_conflict = conflicts.TextConflict('file', file_id=b'file_id')
182
 
        tree.set_conflicts(conflicts.ConflictList([file_conflict]))
 
182
        file_conflict = _mod_bzr_conflicts.TextConflict('file', file_id=b'file_id')
 
183
        tree.set_conflicts([file_conflict])
183
184
        note = self.run_bzr('resolve', retcode=1, working_dir='tree')[1]
184
185
        self.assertContainsRe(note, '0 conflicts auto-resolved.')
185
186
        self.assertContainsRe(note,