/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: Canonical.com Patch Queue Manager
  • Date: 2007-03-12 16:46:21 UTC
  • mfrom: (1551.12.52 mergedirective)
  • Revision ID: pqm@pqm.ubuntu.com-20070312164621-d96558dc43d9c1b6
Small tweaks for merge directives

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/errors.py
1876
1876
        self.name = name
1877
1877
 
1878
1878
 
 
1879
class NotAMergeDirective(BzrError):
 
1880
    """File starting with %(firstline)r is not a merge directive"""
 
1881
    def __init__(self, firstline):
 
1882
        BzrError.__init__(self, firstline=firstline)
 
1883
 
 
1884
 
1879
1885
class NoMergeSource(BzrError):
1880
1886
    """Raise if no merge source was specified for a merge directive"""
1881
1887