/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

Merged from mainline

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/errors.py
142
142
    # Error from malformed user command
143
143
    # This is being misused as a generic exception
144
144
    # pleae subclass. RBC 20051030
 
145
    #
 
146
    # I think it's a waste of effort to differentiate between errors that
 
147
    # are not intended to be caught anyway.  UI code need not subclass
 
148
    # BzrCommandError, and non-UI code should not throw a subclass of
 
149
    # BzrCommandError.  ADHB 20051211
145
150
    def __str__(self):
146
151
        return self.args[0]
147
152
 
271
276
 
272
277
class DivergedBranches(BzrError):
273
278
    def __init__(self, branch1, branch2):
274
 
        BzrError.__init__(self, "These branches have diverged.")
 
279
        BzrError.__init__(self, "These branches have diverged.  Try merge.")
275
280
        self.branch1 = branch1
276
281
        self.branch2 = branch2
277
282