/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: 2018-11-16 23:15:15 UTC
  • mfrom: (7180 work)
  • mto: This revision was merged to the branch mainline in revision 7183.
  • Revision ID: jelmer@jelmer.uk-20181116231515-zqd2yn6kj8lfydyp
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_resolve.py
175
175
        """Text conflicts can be resolved automatically"""
176
176
        tree = self.make_branch_and_tree('tree')
177
177
        self.build_tree_contents([('tree/file',
178
 
            b'<<<<<<<\na\n=======\n>>>>>>>\n')])
 
178
                                   b'<<<<<<<\na\n=======\n>>>>>>>\n')])
179
179
        tree.add('file', b'file_id')
180
 
        self.assertEqual(tree.kind('file', b'file_id'), 'file')
 
180
        self.assertEqual(tree.kind('file'), 'file')
181
181
        file_conflict = conflicts.TextConflict('file', file_id=b'file_id')
182
182
        tree.set_conflicts(conflicts.ConflictList([file_conflict]))
183
183
        note = self.run_bzr('resolve', retcode=1, working_dir='tree')[1]
184
184
        self.assertContainsRe(note, '0 conflicts auto-resolved.')
185
185
        self.assertContainsRe(note,
186
 
            'Remaining conflicts:\nText conflict in file')
 
186
                              'Remaining conflicts:\nText conflict in file')
187
187
        self.build_tree_contents([('tree/file', b'a\n')])
188
188
        note = self.run_bzr('resolve', working_dir='tree')[1]
189
189
        self.assertContainsRe(note, 'All conflicts resolved.')