/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

  • Committer: John Arbash Meinel
  • Date: 2008-08-08 02:10:19 UTC
  • mfrom: (3613 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3615.
  • Revision ID: john@arbash-meinel.com-20080808021019-e08to54j55sumn1g
Merge bzr.dev 3613, resolve NEWS

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"""
2433
2446
class TagsNotSupported(BzrError):
2434
2447
 
2435
2448
    _fmt = ("Tags not supported by %(branch)s;"
2436
 
            " you may be able to use bzr upgrade --dirstate-tags.")
 
2449
            " you may be able to use bzr upgrade.")
2437
2450
 
2438
2451
    def __init__(self, branch):
2439
2452
        self.branch = branch