~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/errors.py

merge up with HEAD and with test-fixes

Show diffs side-by-side

added added

removed removed

Lines of Context:
114
114
        BzrError.__init__(self, msg)
115
115
 
116
116
 
 
117
class NotAncestor(BzrError):
 
118
    def __init__(self, rev_id, not_ancestor_id):
 
119
        self.rev_id = rev_id
 
120
        self.not_ancestor_id = not_ancestor_id
 
121
        msg = "Revision %s is not an ancestor of %s" % (not_ancestor_id, 
 
122
                                                        rev_id)
 
123
        BzrError.__init__(self, msg)
 
124
 
 
125
 
117
126
class InstallFailed(BzrError):
118
127
    def __init__(self, revisions):
119
128
        self.revisions = revisions