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

  • Committer: Vincent Ladeuil
  • Date: 2009-07-15 07:32:26 UTC
  • mfrom: (4536 +trunk)
  • mto: (4536.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4537.
  • Revision ID: v.ladeuil+lp@free.fr-20090715073226-a7ylxd6ctbzeu0o6
Merge trunk resolving conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/errors.py
2162
2162
        self.reason = reason
2163
2163
 
2164
2164
 
 
2165
class InconsistentDeltaDelta(InconsistentDelta):
 
2166
    """Used when we get a delta that is not valid."""
 
2167
 
 
2168
    _fmt = ("An inconsistent delta was supplied: %(delta)r"
 
2169
            "\nreason: %(reason)s")
 
2170
 
 
2171
    def __init__(self, delta, reason):
 
2172
        BzrError.__init__(self)
 
2173
        self.delta = delta
 
2174
        self.reason = reason
 
2175
 
 
2176
 
2165
2177
class UpgradeRequired(BzrError):
2166
2178
 
2167
2179
    _fmt = "To use this feature you must upgrade your branch at %(path)s."