/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/tests/blackbox/test_resolve.py

• browse files at revision 6819
• compare with another revision
• compare with revision 7515.1.1
• download diff
• download tarball
• view history from revision 6819

Show diffs side-by-side

added

removed

breezy/tests/blackbox/test_resolve.py

119

119

        self.build_tree_contents([('tree/file',

120

120

            '<<<<<<<\na\n=======\n>>>>>>>\n')])

121

121

        tree.add('file', 'file_id')

122

 

        self.assertEqual(tree.kind('file_id'), 'file')

 

122

        self.assertEqual(tree.kind('file', 'file_id'), 'file')

123

123

        file_conflict = conflicts.TextConflict('file', file_id='file_id')

124

124

        tree.set_conflicts(conflicts.ConflictList([file_conflict]))

125

125

        note = self.run_bzr('resolve', retcode=1, working_dir='tree')[1]

• Older »

Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0