← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_subsume.py

  • Committer: Aaron Bentley
  • Date: 2006-12-11 23:32:28 UTC
  • mto: (2255.6.1 dirstate)
  • mto: This revision was merged to the branch mainline in revision 2322.
  • Revision ID: aaron.bentley@utoronto.ca-20061211233228-wh8chcfx949px2c2
Stop generating unique roots for WorkingTree3

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_subsume.py
21
21
 
22
22
    def make_branch_and_tree(self, relpath, format=None):
23
23
        if format is None:
24
 
            format = bzrdir.get_knit2_format()
 
24
            format = bzrdir.get_knit3_format()
25
25
        return tests.TestCaseWithTransport.make_branch_and_tree(self, relpath, 
26
26
                                                          format)
27
27
 
34
34
        base_tree.add('file', 'file-id')
35
35
        base_tree.commit('first commit', rev_id='tree-1')
36
36
        sub_tree = self.make_branch_and_tree('tree/subtree', 
37
 
                                             format=bzrdir.get_knit1_format())
 
37
                                             format=bzrdir.get_knit3_format())
38
38
        if same_root is True:
39
39
            sub_tree.set_root_id(base_tree.get_root_id())
40
40
        sub_tree.add('file2', 'file2-id')