~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/repository.py

Merged bzr.dev into shelve-editor.

Show diffs side-by-side

added added

removed removed

Lines of Context:
50
50
""")
51
51
 
52
52
from bzrlib.decorators import needs_read_lock, needs_write_lock, only_raises
53
 
from bzrlib.lock import _RelockDebugMixin
54
53
from bzrlib.inter import InterObject
55
54
from bzrlib.inventory import (
56
55
    Inventory,
58
57
    ROOT_ID,
59
58
    entry_factory,
60
59
    )
 
60
from bzrlib.lock import _RelockDebugMixin
61
61
from bzrlib import registry
62
62
from bzrlib.trace import (
63
63
    log_exception_quietly, note, mutter, mutter_callsite, warning)