← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/errors.py

  • Committer: aaron.bentley at utoronto
  • Date: 2005-08-27 04:42:41 UTC
  • mfrom: (1092.1.43)
  • mto: (1185.3.4)
  • mto: This revision was merged to the branch mainline in revision 1178.
  • Revision ID: aaron.bentley@utoronto.ca-20050827044241-23d676133b9fc981
Merge of robertc@robertcollins.net-20050826013321-52eee1f1da679ee9

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/errors.py
91
91
        msg = "Branch %s has no revision %s" % (branch, revision)
92
92
        BzrError.__init__(self, msg)
93
93
 
 
94
 
 
95
class UnrelatedBranches(BzrCommandError):
 
96
    def __init__(self):
 
97
        msg = "Branches have no common ancestor, and no base revision"\
 
98
            " specified."
 
99
        BzrCommandError.__init__(self, msg)
 
100
 
 
101
 
94
102
class NotAncestor(BzrError):
95
103
    def __init__(self, rev_id, not_ancestor_id):
96
104
        self.rev_id = rev_id
99
107
                                                        rev_id)
100
108
        BzrError.__init__(self, msg)
101
109
 
 
110
 
102
111
class InstallFailed(BzrError):
103
112
    def __init__(self, revisions):
104
113
        self.revisions = revisions