~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2006-03-08 05:18:38 UTC
  • mfrom: (1558.3.3 Aaron's integration)
  • Revision ID: pqm@pqm.ubuntu.com-20060308051838-876e9f9ac39ee578
Fix for merge_modified error handling

Show diffs side-by-side

added added

removed removed

Lines of Context:
61
61
                           WeaveRevisionNotPresent,
62
62
                           NotBranchError,
63
63
                           NoSuchFile,
64
 
                           NotVersionedError)
 
64
                           NotVersionedError,
 
65
                           MergeModifiedFormatError)
65
66
from bzrlib.inventory import InventoryEntry, Inventory
66
67
from bzrlib.lockable_files import LockableFiles, TransportLock
67
68
from bzrlib.merge import merge_inner, transform_tree