← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/errors.py

  • Committer: Aaron Bentley
  • Date: 2007-03-11 00:47:07 UTC
  • mto: (2323.6.9 0.15-integration)
  • mto: This revision was merged to the branch mainline in revision 2342.
  • Revision ID: aaron.bentley@utoronto.ca-20070311004707-nvgm18l7xx9md7hg
Proper error when deserializing junk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/errors.py
1867
1867
        self.name = name
1868
1868
 
1869
1869
 
 
1870
class NotAMergeDirective(BzrError):
 
1871
    """File starting with %(firstline)r is not a merge directive"""
 
1872
    def __init__(self, firstline):
 
1873
        BzrError.__init__(self, firstline=firstline)
 
1874
 
 
1875
 
1870
1876
class NoMergeSource(BzrError):
1871
1877
    """Raise if no merge source was specified for a merge directive"""
1872
1878