← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/errors.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2008-07-30 05:06:05 UTC
  • mfrom: (3592.1.1 ianc-integration)
  • Revision ID: pqm@pqm.ubuntu.com-20080730050605-5hhtw13vhgailydn
Give a more specific error when target branch unreachable (James
        Westby)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/errors.py
2385
2385
        self.patch_type = patch_type
2386
2386
 
2387
2387
 
 
2388
class TargetNotBranch(BzrError):
 
2389
    """A merge directive's target branch is required, but isn't a branch"""
 
2390
 
 
2391
    _fmt = ("Your branch does not have all of the revisions required in "
 
2392
            "order to merge this merge directive and the target "
 
2393
            "location specified in the merge directive is not a branch: "
 
2394
            "%(location)s.")
 
2395
 
 
2396
    def __init__(self, location):
 
2397
        BzrError.__init__(self)
 
2398
        self.location = location
 
2399
 
 
2400
 
2388
2401
class UnsupportedInventoryKind(BzrError):
2389
2402
    
2390
2403
    _fmt = """Unsupported entry kind %(kind)s"""