← Back to branch summary

~bzr-pqm/bzr/bzr.dev

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/errors.py

Committer: Aaron Bentley
Date: 2006-03-07 19:46:39 UTC
mfrom: (1558.3.3 Aaron's integration)
mto: (1551.2.26 Aaron's small fixes)
mto: This revision was merged to the branch mainline in revision 1603.
Revision ID: abentley@panoramicfeedback.com-20060307194639-68365add92c0bad3

Merge from bzr.ab.integration

files modified:
bzrlib/commit.py

bzrlib/errors.py

bzrlib/merge.py

bzrlib/tests/test_commit.py

bzrlib/tests/test_inv.py

bzrlib/tests/test_transform.py

bzrlib/tests/workingtree_implementations/test_workingtree.py

bzrlib/transform.py

bzrlib/workingtree.py

Show diffs side-by-side

added added

removed removed

bzrlib/errors.py

745

745

self.tree = tree

746

746

747

747

748

class MergeModifiedFormatError(BzrNewError):

749

"""Error in merge modified format"""

750

751

748

752

class CorruptRepository(BzrNewError):

749

753

"""An error has been detected in the repository %(repo_path)s.

750

754

Please run bzr reconcile on this repository."""

Older »