← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/errors.py

merge in lalos branch tidyup

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/errors.py
92
92
        BzrError.__init__(self, msg)
93
93
 
94
94
 
 
95
class DivergedBranches(BzrError):
 
96
    def __init__(self, branch1, branch2):
 
97
        self.branch1 = branch1
 
98
        self.branch2 = branch2
 
99
        BzrError.__init__(self, "These branches have diverged.")
 
100
 
95
101
class UnrelatedBranches(BzrCommandError):
96
102
    def __init__(self):
97
103
        msg = "Branches have no common ancestor, and no base revision"\