← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: Jelmer Vernooij
  • Date: 2011-12-19 11:49:56 UTC
  • mfrom: (6384 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6386.
  • Revision ID: jelmer@canonical.com-20111219114956-wb5i1g0ku1t49vk6
merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
71
71
    )
72
72
""")
73
73
 
 
74
# Explicitly import bzrlib.bzrdir so that the BzrProber
 
75
# is guaranteed to be registered.
 
76
import bzrlib.bzrdir
 
77
 
74
78
from bzrlib import symbol_versioning
75
79
from bzrlib.decorators import needs_read_lock, needs_write_lock
76
80
from bzrlib.i18n import gettext