← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/workingtree_implementations/test_workingtree.py

Merge WorkingTree implementation back from trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/workingtree_implementations/test_workingtree.py
562
562
        self.assertEqual(master_tree.branch.revision_history(),
563
563
            tree.branch.revision_history())
564
564
 
565
 
    def test_merge_modified(self):
 
565
    def test_merge_modified_detects_corruption(self):
 
566
        # FIXME: This doesn't really test that it works; also this is not
 
567
        # implementation-independent. mbp 20070226
566
568
        tree = self.make_branch_and_tree('master')
567
569
        tree._control_files.put('merge-hashes', StringIO('asdfasdf'))
568
570
        self.assertRaises(errors.MergeModifiedFormatError, tree.merge_modified)