3068
3068
merger.merge_type = Merge3Merger
3069
3069
merger.do_merge()
3071
def test_has_filename(self):
3072
wt = self.make_branch_and_tree('tree')
3073
self.build_tree(['tree/unmodified', 'tree/removed', 'tree/modified'])
3074
tt = TransformPreview(wt)
3075
removed_id = tt.trans_id_tree_path('removed')
3076
tt.delete_contents(removed_id)
3077
tt.new_file('new', tt.root, 'contents')
3078
modified_id = tt.trans_id_tree_path('modified')
3079
tt.delete_contents(modified_id)
3080
tt.create_file('modified-contents', modified_id)
3081
self.addCleanup(tt.finalize)
3082
tree = tt.get_preview_tree()
3083
self.assertTrue(tree.has_filename('unmodified'))
3084
self.assertFalse(tree.has_filename('not-present'))
3085
self.assertFalse(tree.has_filename('removed'))
3086
self.assertTrue(tree.has_filename('new'))
3087
self.assertTrue(tree.has_filename('modified'))
3071
3089
def test_is_executable(self):
3072
3090
tree = self.make_branch_and_tree('tree')
3073
3091
preview = TransformPreview(tree)