← Back to branch summary

~benoit.pierre/bzrtools/shell_improvements

« back to all changes in this revision

Viewing changes to errors.py

  • Committer: Benoît Pierre
  • Date: 2009-08-02 12:55:24 UTC
  • mfrom: (682.1.36 bzrtools)
  • Revision ID: benoit.pierre@gmail.com-20090802125524-1p2oot1y2l0y3o9w
Merge with upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
errors.py
74
74
class ChangedBinaryFiles(BzrError):
75
75
 
76
76
    _fmt = 'Changes involve binary files.'
 
77
 
 
78
 
 
79
class NoConflictFiles(CommandError):
 
80
 
 
81
    _fmt = '%(base_name)s does not exist and there are no pending merges.'
 
82
 
 
83
    def __init__(self, base_name):
 
84
        CommandError.__init__(self, base_name=base_name)