← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: John Arbash Meinel
  • Date: 2008-11-21 20:24:15 UTC
  • mfrom: (3845 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3847.
  • Revision ID: john@arbash-meinel.com-20081121202415-30ok91cqouwa7f7e
Merge in bzr.dev 3845 and handle the trivial conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
85
85
from bzrlib import symbol_versioning
86
86
from bzrlib.decorators import needs_read_lock, needs_write_lock
87
87
from bzrlib.inventory import InventoryEntry, Inventory, ROOT_ID, TreeReference
88
 
from bzrlib.lockable_files import LockableFiles, TransportLock
 
88
from bzrlib.lockable_files import LockableFiles
89
89
from bzrlib.lockdir import LockDir
90
90
import bzrlib.mutabletree
91
91
from bzrlib.mutabletree import needs_tree_write_lock