/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: Robert Collins
  • Date: 2007-07-20 02:27:13 UTC
  • mfrom: (2634 +trunk)
  • mto: (2592.3.48 repository)
  • mto: This revision was merged to the branch mainline in revision 2682.
  • Revision ID: robertc@robertcollins.net-20070720022713-z6x6cns4dy1mzhpk
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/errors.py
1263
1263
        self.file_id = file_id
1264
1264
 
1265
1265
 
 
1266
class VersionedFileInvalidChecksum(VersionedFileError):
 
1267
 
 
1268
    _fmt = "Text did not match its checksum: %(message)s"
 
1269
 
 
1270
 
1266
1271
class KnitError(BzrError):
1267
1272
    
1268
1273
    _fmt = "Knit error"
2114
2119
        " branch location."
2115
2120
 
2116
2121
 
 
2122
class IllegalMergeDirectivePayload(BzrError):
 
2123
    """A merge directive contained something other than a patch or bundle"""
 
2124
 
 
2125
    _fmt = "Bad merge directive payload %(start)r"
 
2126
 
 
2127
    def __init__(self, start):
 
2128
        BzrError(self)
 
2129
        self.start = start
 
2130
 
 
2131
 
 
2132
class PatchVerificationFailed(BzrError):
 
2133
    """A patch from a merge directive could not be verified"""
 
2134
 
 
2135
    _fmt = "Preview patch does not match requested changes."
 
2136
 
 
2137
 
2117
2138
class PatchMissing(BzrError):
2118
2139
    """Raise a patch type was specified but no patch supplied"""
2119
2140