← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_commit.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/test_commit.py
19
19
 
20
20
import bzrlib
21
21
from bzrlib import (
22
 
    bzrdir,
23
22
    config,
 
23
    controldir,
24
24
    errors,
25
25
    )
26
26
from bzrlib.branch import Branch
835
835
    def test_commit_with_checkout_and_branch_sharing_repo(self):
836
836
        repo = self.make_repository('repo', shared=True)
837
837
        # make_branch_and_tree ignores shared repos
838
 
        branch = bzrdir.BzrDir.create_branch_convenience('repo/branch')
 
838
        branch = controldir.ControlDir.create_branch_convenience('repo/branch')
839
839
        tree2 = branch.create_checkout('repo/tree2')
840
840
        tree2.commit('message', rev_id='rev1')
841
841
        self.assertTrue(tree2.branch.repository.has_revision('rev1'))