← Back to branch summary

~abentley/bzr/status

« back to all changes in this revision

Viewing changes to bzrlib/errors.py

  • Committer: Aaron Bentley
  • Date: 2009-05-05 18:16:33 UTC
  • mfrom: (1731.1744.1078 +trunk)
  • mto: This revision was merged to the branch mainline in revision 1931.
  • Revision ID: aaron@aaronbentley.com-20090505181633-3qtq1skwjzed0kug
Merge bzr.dev into composite-tree.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/errors.py
1173
1173
class DivergedBranches(BzrError):
1174
1174
 
1175
1175
    _fmt = ("These branches have diverged."
1176
 
            " Use the merge command to reconcile them.")
 
1176
            " Use the missing command to see how.\n"
 
1177
            "Use the merge command to reconcile them.")
1177
1178
 
1178
1179
    def __init__(self, branch1, branch2):
1179
1180
        self.branch1 = branch1
1227
1228
            not_ancestor_id=not_ancestor_id)
1228
1229
 
1229
1230
 
1230
 
class InstallFailed(BzrError):
1231
 
 
1232
 
    def __init__(self, revisions):
1233
 
        revision_str = ", ".join(str(r) for r in revisions)
1234
 
        msg = "Could not install revisions:\n%s" % revision_str
1235
 
        BzrError.__init__(self, msg)
1236
 
        self.revisions = revisions
1237
 
 
1238
 
 
1239
1231
class AmbiguousBase(BzrError):
1240
1232
 
1241
1233
    def __init__(self, bases):