← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bzrdir.py

  • Committer: Jelmer Vernooij
  • Date: 2011-02-25 16:16:09 UTC
  • mto: (5582.10.75 weave-fmt-plugin)
  • mto: This revision was merged to the branch mainline in revision 5693.
  • Revision ID: jelmer@samba.org-20110225161609-k87djxboxpciaygv
Fix some tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bzrdir.py
37
37
 
38
38
import bzrlib
39
39
from bzrlib import (
40
 
    branch,
41
40
    config,
42
41
    controldir,
43
42
    errors,
2044
2043
            if target_branch is None:
2045
2044
                if do_upgrade:
2046
2045
                    # TODO: bad monkey, hard-coded formats...
2047
 
                    new_branch_format = branch.BzrBranchFormat7()
 
2046
                    from bzrlib.branch import BzrBranchFormat7
 
2047
                    new_branch_format = BzrBranchFormat7()
2048
2048
            else:
2049
2049
                new_branch_format = target_branch._format
2050
2050
                if not new_branch_format.supports_stacking():