/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: Andrew Bennetts
  • Date: 2007-12-21 05:52:38 UTC
  • mfrom: (3137 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3138.
  • Revision ID: andrew.bennetts@canonical.com-20071221055238-0wjubfut943uzovf
Merge from bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/errors.py
1101
1101
            " no merge base revision was specified.")
1102
1102
 
1103
1103
 
 
1104
class CannotReverseCherrypick(BzrError):
 
1105
 
 
1106
    _fmt = ('Selected merge cannot perform reverse cherrypicks.  Try merge3'
 
1107
            ' or diff3.')
 
1108
 
 
1109
 
1104
1110
class NoCommonAncestor(BzrError):
1105
1111
    
1106
1112
    _fmt = "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
2488
2494
        BzrError.__init__(self, tree=tree, display_url=display_url)
2489
2495
 
2490
2496
 
 
2497
class MissingTemplateVariable(BzrError):
 
2498
 
 
2499
    _fmt = 'Variable {%(name)s} is not available.'
 
2500
 
 
2501
    def __init__(self, name):
 
2502
        self.name = name
 
2503
 
 
2504
 
2491
2505
class UnableCreateSymlink(BzrError):
2492
2506
 
2493
2507
    _fmt = 'Unable to create symlink %(path_str)son this platform'