← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/errors.py

  • Committer: John Arbash Meinel
  • Date: 2010-09-29 20:18:37 UTC
  • mfrom: (5450 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5452.
  • Revision ID: john@arbash-meinel.com-20100929201837-6d9jhvjokfe3ubvk
Merge bzr.dev 5450 to resolve NEWS and criss-cross merge.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/errors.py
1395
1395
 
1396
1396
class WeaveInvalidChecksum(WeaveError):
1397
1397
 
1398
 
    _fmt = "Text did not match it's checksum: %(msg)s"
 
1398
    _fmt = "Text did not match its checksum: %(msg)s"
1399
1399
 
1400
1400
 
1401
1401
class WeaveTextDiffers(WeaveError):