/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-10-29 11:27:33 UTC
  • mto: This revision was merged to the branch mainline in revision 7170.
  • Revision ID: jelmer@jelmer.uk-20181029112733-bjvm24z12svwl53m
Get rid of file_ids in most of Tree.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_resolve.py
177
177
        self.build_tree_contents([('tree/file',
178
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]