← 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

Fixed executability conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_merge_core.py
300
300
        builder.change_perms("2", base=False)
301
301
        builder.add_file("3", "TREE_ROOT", "name3", "text3", True)
302
302
        builder.change_perms("3", this=False)
 
303
        builder.add_file('4', 'TREE_ROOT', 'name4', 'text4', False)
 
304
        builder.change_perms('4', this=True)
 
305
        builder.remove_file('4', base=True)
303
306
        builder.merge()
304
307
        self.assertIs(builder.this.is_executable("1"), False)
305
308
        self.assertIs(builder.this.is_executable("2"), True)