/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_transform.py

Merge with set_parent_ids

Show diffs side-by-side

added added

removed removed

Lines of Context:
2315
2315
        preview_tree = preview.get_preview_tree()
2316
2316
        self.assertEqual(True, preview_tree.is_executable('file-id'))
2317
2317
 
 
2318
    def test_get_set_parent_ids(self):
 
2319
        revision_tree, preview_tree = self.get_tree_and_preview_tree()
 
2320
        self.assertEqual([], preview_tree.get_parent_ids())
 
2321
        preview_tree.set_parent_ids(['rev-1'])
 
2322
        self.assertEqual(['rev-1'], preview_tree.get_parent_ids())
 
2323
 
2318
2324
    def test_plan_file_merge(self):
2319
2325
        work_a = self.make_branch_and_tree('wta')
2320
2326
        self.build_tree_contents([('wta/file', 'a\nb\nc\nd\n')])