← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/errors.py

  • Committer: Robert Collins
  • Date: 2007-11-18 19:56:39 UTC
  • mfrom: (3006 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3038.
  • Revision ID: robertc@robertcollins.net-20071118195639-m6zf3d5ljjw88kkn
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/errors.py
470
470
    """Used when renaming and both source and dest exist."""
471
471
 
472
472
    _fmt = ("Could not rename %(source)s => %(dest)s because both files exist."
473
 
            "%(extra)s")
 
473
            " (Use --after to tell bzr about a rename that has already"
 
474
            " happened)%(extra)s")
474
475
 
475
476
    def __init__(self, source, dest, extra=None):
476
477
        BzrError.__init__(self)
1897
1898
 
1898
1899
class ImmortalPendingDeletion(BzrError):
1899
1900
 
1900
 
    _fmt = """Unable to delete transform temporary directory
1901
 
    %(pending_deletion)s.  Please examine %(pending_deletions)s to see if it
1902
 
    contains any files you wish to keep, and delete it when you are done."""
 
1901
    _fmt = ("Unable to delete transform temporary directory "
 
1902
    "%(pending_deletion)s.  Please examine %(pending_deletion)s to see if it "
 
1903
    "contains any files you wish to keep, and delete it when you are done.")
1903
1904
 
1904
1905
    def __init__(self, pending_deletion):
1905
1906
       BzrError.__init__(self, pending_deletion=pending_deletion)