← 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: Tarmac
  • Author(s): Vincent Ladeuil
  • Date: 2017-01-30 14:42:05 UTC
  • mfrom: (6620.1.1 trunk)
  • Revision ID: tarmac-20170130144205-r8fh2xpmiuxyozpv
Merge  2.7 into trunk including fix for bug #1657238 [r=vila]

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,
22
21
    osutils,
23
 
    repository,
24
22
    tests,
25
23
    workingtree,
26
24
    )
30
28
 
31
29
    def make_trees(self):
32
30
        base_tree = self.make_branch_and_tree('tree',
33
 
            format='dirstate-with-subtree')
 
31
            format='development-subtree')
34
32
        base_tree.commit('empty commit')
35
33
        self.build_tree(['tree/subtree/', 'tree/subtree/file1'])
36
34
        sub_tree = self.make_branch_and_tree('tree/subtree')