← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bzrdir.py

  • Committer: John Arbash Meinel
  • Date: 2011-04-07 10:36:24 UTC
  • mfrom: (5764 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5766.
  • Revision ID: john@arbash-meinel.com-20110407103624-n76g6tjeqmznwdcd
Merge bzr.dev 5764 to resolve release-notes (aka NEWS) conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bzrdir.py
29
29
 
30
30
from bzrlib.lazy_import import lazy_import
31
31
lazy_import(globals(), """
32
 
from stat import S_ISDIR
33
 
 
34
32
import bzrlib
35
33
from bzrlib import (
 
34
    branch as _mod_branch,
36
35
    cleanup,
37
36
    config,
38
37
    controldir,
49
48
    transport as _mod_transport,
50
49
    ui,
51
50
    urlutils,
52
 
    versionedfile,
53
51
    win32utils,
54
52
    workingtree,
55
53
    workingtree_4,
1860
1858
            # TODO: conversions of Branch and Tree should be done by
1861
1859
            # InterXFormat lookups/some sort of registry.
1862
1860
            # Avoid circular imports
1863
 
            from bzrlib import branch as _mod_branch
1864
1861
            old = branch._format.__class__
1865
1862
            new = self.target_format.get_branch_format().__class__
1866
1863
            while old != new: