/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/inter.py

  • Committer: John Arbash Meinel
  • Date: 2011-05-17 11:27:58 UTC
  • mto: This revision was merged to the branch mainline in revision 5880.
  • Revision ID: john@arbash-meinel.com-20110517112758-eayd47x2h1jdp4zo
https://launchpad.net/bugs/781168
Fix bug #781168, and allow WT.update_basis_by_delta
to apply a delta that does not match the WT state. The check is nice to have
for commit, but it doesn't make sense to have for uncommit, etc.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/inter.py
18
18
"""Inter-object utility class."""
19
19
 
20
20
 
 
21
from bzrlib.errors import NoCompatibleInter
 
22
 
 
23
 
21
24
class InterObject(object):
22
25
    """This class represents operations taking place between two objects.
23
26
 
81
84
        for provider in reversed(klass._optimisers):
82
85
            if provider.is_compatible(source, target):
83
86
                return provider(source, target)
84
 
        return klass(source, target)
 
87
        raise NoCompatibleInter(source, target)
85
88
 
86
89
    def lock_read(self):
87
90
        """Take out a logical read lock.