← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
54
54
from bzrlib import bzrdir, errors, osutils, urlutils
55
55
from bzrlib.atomicfile import AtomicFile
56
56
import bzrlib.branch
57
 
import bzrlib.bzrdir as bzrdir
58
57
from bzrlib.conflicts import Conflict, ConflictList, CONFLICT_SUFFIXES
59
58
from bzrlib.decorators import needs_read_lock, needs_write_lock
60
59
from bzrlib.errors import (BzrCheckError,