← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_reconfigure.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_reconfigure.py
16
16
 
17
17
from bzrlib import (
18
18
    branch as _mod_branch,
19
 
    bzrdir,
 
19
    controldir,
20
20
    errors,
21
21
    reconfigure,
22
22
    repository,
72
72
        checkout = branch.create_checkout('checkout')
73
73
        reconfiguration = reconfigure.Reconfigure.to_branch(checkout.bzrdir)
74
74
        reconfiguration.apply()
75
 
        reconfigured = bzrdir.BzrDir.open('checkout').open_branch()
 
75
        reconfigured = controldir.ControlDir.open('checkout').open_branch()
76
76
        self.assertIs(None, reconfigured.get_bound_location())
77
77
 
78
78
    def prepare_lightweight_checkout_to_branch(self):
445
445
            r"Requested reconfiguration of '.*' is not supported.")
446
446
 
447
447
    def test_lightweight_checkout_to_tree_preserves_reference_locations(self):
448
 
        format = bzrdir.format_registry.make_bzrdir('1.9')
 
448
        format = controldir.format_registry.make_bzrdir('1.9')
449
449
        format.set_branch_format(_mod_branch.BzrBranchFormat8())
450
450
        tree = self.make_branch_and_tree('tree', format=format)
451
451
        tree.branch.set_reference_info('file_id', 'path', '../location')