/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_break_lock.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_break_lock.py
18
18
 
19
19
from bzrlib import (
20
20
    branch,
21
 
    bzrdir,
22
21
    config,
 
22
    controldir,
23
23
    errors,
24
24
    osutils,
25
25
    tests,
54
54
             'repo/',
55
55
             'repo/branch/',
56
56
             'checkout/'])
57
 
        bzrdir.BzrDir.create('master-repo').create_repository()
58
 
        self.master_branch = bzrdir.BzrDir.create_branch_convenience(
 
57
        controldir.ControlDir.create('master-repo').create_repository()
 
58
        self.master_branch = controldir.ControlDir.create_branch_convenience(
59
59
            'master-repo/master-branch')
60
 
        bzrdir.BzrDir.create('repo').create_repository()
61
 
        local_branch = bzrdir.BzrDir.create_branch_convenience('repo/branch')
 
60
        controldir.ControlDir.create('repo').create_repository()
 
61
        local_branch = controldir.ControlDir.create_branch_convenience('repo/branch')
62
62
        local_branch.bind(self.master_branch)
63
 
        checkoutdir = bzrdir.BzrDir.create('checkout')
 
63
        checkoutdir = controldir.ControlDir.create('checkout')
64
64
        checkoutdir.set_branch_reference(local_branch)
65
65
        self.wt = checkoutdir.create_workingtree()
66
66