/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tree.py

  • Committer: Aaron Bentley
  • Date: 2010-04-24 00:29:12 UTC
  • mto: This revision was merged to the branch mainline in revision 5186.
  • Revision ID: aaron@aaronbentley.com-20100424002912-np8lkz9u1l9a9mxq
Fix switch/merge when a ConfigurableFileMerger is used.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tree.py
36
36
from bzrlib.inventory import InventoryFile
37
37
from bzrlib.inter import InterObject
38
38
from bzrlib.osutils import fingerprint_file
 
39
import bzrlib.revision
39
40
from bzrlib.symbol_versioning import deprecated_function, deprecated_in
40
41
from bzrlib.trace import note
41
42