← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Vincent Ladeuil
  • Date: 2012-03-08 18:30:33 UTC
  • mfrom: (6487 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6488.
  • Revision ID: v.ladeuil+lp@free.fr-20120308183033-bccqnbr1tpozs711
Merge bzr.dev resolving conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_send.py
20
20
 
21
21
from bzrlib import (
22
22
    branch,
23
 
    bzrdir,
24
23
    merge_directive,
25
24
    tests,
26
25
    )
63
62
 
64
63
    def setUp(self):
65
64
        super(TestSend, self).setUp()
66
 
        grandparent_tree = bzrdir.BzrDir.create_standalone_workingtree(
 
65
        grandparent_tree = ControlDir.create_standalone_workingtree(
67
66
            'grandparent')
68
67
        self.build_tree_contents([('grandparent/file1', 'grandparent')])
69
68
        grandparent_tree.add('file1')
275
274
 
276
275
    def make_parent_and_local_branches(self):
277
276
        # Create a 'parent' branch as the base
278
 
        self.parent_tree = bzrdir.BzrDir.create_standalone_workingtree('parent')
 
277
        self.parent_tree = ControlDir.create_standalone_workingtree('parent')
279
278
        self.build_tree_contents([('parent/file', 'parent')])
280
279
        self.parent_tree.add('file')
281
280
        self.parent_tree.commit('first commit', rev_id='parent')