/breezy/trunk

To get this branch, use:
bzr branch https://code.breezy-vcs.org/breezy/trunk

« back to all changes in this revision

Viewing changes to bzrlib/errors.py

Merged John Meinel's integration

Show diffs side-by-side

added added

removed removed

Lines of Context:
396
396
        self.weave_b = weave_b
397
397
 
398
398
 
 
399
class WeaveTextDiffers(WeaveError):
 
400
    """Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, %(weave_b)s"""
 
401
 
 
402
    def __init__(self, revision_id, weave_a, weave_b):
 
403
        WeaveError.__init__(self)
 
404
        self.revision_id = revision_id
 
405
        self.weave_a = weave_a
 
406
        self.weave_b = weave_b
 
407
 
 
408
 
399
409
class NoSuchExportFormat(BzrNewError):
400
410
    """Export format %(format)r not supported"""
401
411
    def __init__(self, format):