← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/errors.py

  • Committer: Matt Giuca
  • Date: 2010-05-28 06:04:57 UTC
  • mto: This revision was merged to the branch mainline in revision 5282.
  • Revision ID: matt.giuca@gmail.com-20100528060457-v03aq5pfd0vzjvej
https://launchpad.net/bugs/586639
remove-tree now refuses to run without --force if there are shelved changes.
    (#586639)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/errors.py
2850
2850
        BzrError.__init__(self, tree=tree, display_url=display_url, more=more)
2851
2851
 
2852
2852
 
 
2853
class ShelvedChanges(UncommittedChanges):
 
2854
 
 
2855
    _fmt = ('Working tree "%(display_url)s" has shelved changes'
 
2856
            ' (See bzr shelve --list).%(more)s')
 
2857
 
 
2858
 
2853
2859
class MissingTemplateVariable(BzrError):
2854
2860
 
2855
2861
    _fmt = 'Variable {%(name)s} is not available.'