← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_join.py

  • Committer: Jelmer Vernooij
  • Date: 2012-01-27 16:27:26 UTC
  • mto: This revision was merged to the branch mainline in revision 6449.
  • Revision ID: jelmer@samba.org-20120127162726-f3qlvm7xkfg460ck
Run subtree tests with development-subtree rather than deprecated dirstate-with-subtree.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_join.py
30
30
 
31
31
    def make_trees(self):
32
32
        base_tree = self.make_branch_and_tree('tree',
33
 
            format='dirstate-with-subtree')
 
33
            format='development-subtree')
34
34
        base_tree.commit('empty commit')
35
35
        self.build_tree(['tree/subtree/', 'tree/subtree/file1'])
36
36
        sub_tree = self.make_branch_and_tree('tree/subtree')