← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bzrdir.py

Merge main branch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bzrdir.py
55
55
    workingtree,
56
56
    workingtree_4,
57
57
    )
58
 
from bzrlib.osutils import (
59
 
    sha_string,
60
 
    )
61
 
from bzrlib.push import (
62
 
    PushResult,
63
 
    )
64
58
from bzrlib.repofmt import pack_repo
65
59
from bzrlib.smart.client import _SmartClient
66
60
from bzrlib.store.versioned import VersionedFileStore
81
75
 
82
76
from bzrlib import (
83
77
    hooks,
84
 
    symbol_versioning,
85
78
    )
86
79
from bzrlib.symbol_versioning import (
87
80
    deprecated_in,
1466
1459
 
1467
1460
    _lock_class = lockdir.LockDir
1468
1461
 
 
1462
    fixed_components = False
 
1463
 
1469
1464
    def __init__(self):
1470
1465
        self._workingtree_format = None
1471
1466
        self._branch_format = None