← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/errors.py

Better error for selected-file commit of merges

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/errors.py
845
845
    _fmt = "No changes to commit"
846
846
 
847
847
 
 
848
class CannotCommitSelectedFileMerge(BzrError):
 
849
 
 
850
    _fmt = 'Selected-file commit of merges is not supported yet:'\
 
851
        ' files %(files_str)s'
 
852
 
 
853
    def __init__(self, files):
 
854
        files_str = ', '.join(files)
 
855
        BzrError.__init__(self, files=files, files_str=files_str)
 
856
 
 
857
 
848
858
class UpgradeReadonly(BzrError):
849
859
 
850
860
    _fmt = "Upgrade URL cannot work with readonly URLs."