← 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: Canonical.com Patch Queue Manager
  • Date: 2006-04-19 08:42:39 UTC
  • mfrom: (1558.15.11 bzr.binaries)
  • Revision ID: pqm@pqm.ubuntu.com-20060419084239-730ca2dccc3bea14
diff and merge handle binaries safely

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_merge_core.py
305
305
        builder = MergeBuilder()
306
306
        builder.add_file("1", "TREE_ROOT", "name1", "text1", True)
307
307
        builder.change_contents("1", other="text4", this="text3")
 
308
        builder.add_file("2", "TREE_ROOT", "name2", "text1", True)
 
309
        builder.change_contents("2", other="\x00", this="text3")
308
310
        conflicts = builder.merge(merge_factory)
309
 
        self.assertEqual(conflicts, [TextConflict('name1', file_id='1')])
 
311
        self.assertEqual(conflicts, [TextConflict('name1', file_id='1'),
 
312
                                     ContentsConflict('name2', file_id='2')])
 
313
        self.assertEqual(builder.this.get_file('2').read(), '\x00')
310
314
        builder.cleanup()
311
315
 
312
316
    def test_symlink_conflicts(self):