← 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: Alexander Belchenko
  • Date: 2012-02-29 12:35:23 UTC
  • mto: (6437.23.21 2.5)
  • mto: This revision was merged to the branch mainline in revision 6493.
  • Revision ID: bialix@ukr.net-20120229123523-giercg9s8ck7ufg1
Standalone bzr.exe includes QtTest library from PyQt4 framework that required for QBzr tests. (Alexander Belchenko, #928963)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_join.py
18
18
import os
19
19
 
20
20
from bzrlib import (
 
21
    bzrdir,
21
22
    osutils,
 
23
    repository,
22
24
    tests,
23
25
    workingtree,
24
26
    )
28
30
 
29
31
    def make_trees(self):
30
32
        base_tree = self.make_branch_and_tree('tree',
31
 
            format='development-subtree')
 
33
            format='dirstate-with-subtree')
32
34
        base_tree.commit('empty commit')
33
35
        self.build_tree(['tree/subtree/', 'tree/subtree/file1'])
34
36
        sub_tree = self.make_branch_and_tree('tree/subtree')