← 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-04-04 23:45:23 UTC
  • mto: This revision was merged to the branch mainline in revision 5757.
  • Revision ID: jelmer@samba.org-20110404234523-xnofbwctx4v1ej8b
Work around lazy import issues.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bzrdir.py
33
33
 
34
34
import bzrlib
35
35
from bzrlib import (
 
36
    branch as _mod_branch,
36
37
    cleanup,
37
38
    config,
38
39
    controldir,
1860
1861
            # TODO: conversions of Branch and Tree should be done by
1861
1862
            # InterXFormat lookups/some sort of registry.
1862
1863
            # Avoid circular imports
1863
 
            from bzrlib import branch as _mod_branch
1864
1864
            old = branch._format.__class__
1865
1865
            new = self.target_format.get_branch_format().__class__
1866
1866
            while old != new: