← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_merge_core.py

  • Committer: Aaron Bentley
  • Date: 2006-04-16 16:20:46 UTC
  • mto: This revision was merged to the branch mainline in revision 1673.
  • Revision ID: aaron.bentley@utoronto.ca-20060416162046-a50698189b032755
Handle binary files for diff3 merges

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_merge_core.py
280
280
        builder = MergeBuilder()
281
281
        builder.add_file("1", "TREE_ROOT", "name1", "text1", True)
282
282
        builder.change_contents("1", other="text4", this="text3")
 
283
        builder.add_file("2", "TREE_ROOT", "name2", "text1", True)
 
284
        builder.change_contents("2", other="\x00", this="text3")
283
285
        conflicts = builder.merge(merge_factory)
284
 
        self.assertEqual(conflicts, [TextConflict('name1', file_id='1')])
 
286
        self.assertEqual(conflicts, [TextConflict('name1', file_id='1'),
 
287
                                     ContentsConflict('name2', file_id='2')])
 
288
        self.assertEqual(builder.this.get_file('2').read(), '\x00')
285
289
        builder.cleanup()
286
290
 
287
291
    def test_symlink_conflicts(self):