← 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: 2005-10-23 00:26:17 UTC
  • mto: (1185.25.1)
  • mto: This revision was merged to the branch mainline in revision 1488.
  • Revision ID: aaron.bentley@utoronto.ca-20051023002617-d57101d2671509f7
Preliminary weave merge support

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/errors.py
343
343
    def __init__(self, command_line):
344
344
        BzrError.__init__(self, "Failed to gpg sign data with command '%s'"
345
345
                               % command_line)
 
346
 
 
347
class WorkingTreeNotRevision(BzrError):
 
348
    def __init__(self, tree):
 
349
        BzrError.__init__(self, "The working tree for %s has changed since"
 
350
                          " last commit, but weave merge requires that it be"
 
351
                          " unchanged." % tree.basedir)