← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_merge.py

Merge bzr.dev into cleanup

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_merge.py
213
213
        self.assertFileEqual('text2', 'tree/sub-tree/file')
214
214
 
215
215
    def test_merge_with_missing(self):
 
216
        self.thisFailsStrictLockCheck()
216
217
        tree_a = self.make_branch_and_tree('tree_a')
217
218
        self.build_tree_contents([('tree_a/file', 'content_1')])
218
219
        tree_a.add('file')