/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: 2019-03-05 07:32:38 UTC
  • mto: (7290.1.21 work)
  • mto: This revision was merged to the branch mainline in revision 7311.
  • Revision ID: jelmer@jelmer.uk-20190305073238-zlqn981opwnqsmzi
Add appveyor configuration.

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