← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/errors.py

  • Committer: Vincent Ladeuil
  • Date: 2011-10-27 15:38:14 UTC
  • mfrom: (6015.44.4 2.4)
  • mto: This revision was merged to the branch mainline in revision 6236.
  • Revision ID: v.ladeuil+lp@free.fr-20111027153814-0r4nd2io1jv6t47f
Merge 2.4 into trunk including fix for bug #880701

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/errors.py
1985
1985
        self.prefix = prefix
1986
1986
 
1987
1987
 
1988
 
class MalformedTransform(BzrError):
 
1988
class MalformedTransform(InternalBzrError):
1989
1989
 
1990
1990
    _fmt = "Tree transform is malformed %(conflicts)r"
1991
1991