← 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

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_merge.py
182
182
            tree_a.conflicts())
183
183
 
184
184
    def test_nested_merge(self):
185
 
        tree = self.make_branch_and_tree('tree', format='experimental-reference-dirstate')
 
185
        tree = self.make_branch_and_tree('tree',
 
186
            format='dirstate-with-subtree')
186
187
        sub_tree = self.make_branch_and_tree('tree/sub-tree',
187
 
                                             format='experimental-reference-dirstate')
 
188
            format='dirstate-with-subtree')
188
189
        sub_tree.set_root_id('sub-tree-root')
189
190
        self.build_tree_contents([('tree/sub-tree/file', 'text1')])
190
191
        sub_tree.add('file')