/brz/remove-bazaar

To get this branch, use:

bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/errors.py

Committer: Robert Collins
Date: 2006-03-08 12:57:47 UTC
mfrom: (1596.2.1 integration)
mto: (1596.2.3 integration) (1594.3.1 versioned-file-performance)
mto: This revision was merged to the branch mainline in revision 1601.
Revision ID: robertc@robertcollins.net-20060308125747-6e30e6743bbd9f7a

Merge from bzr.dev.

files modified:
bzrlib/bzrdir.py

bzrlib/errors.py

bzrlib/merge.py

bzrlib/tests/test_bzrdir.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

792

792

self.tree = tree

793

793

794

794

795

class MergeModifiedFormatError(BzrNewError):

796

"""Error in merge modified format"""

797

798

795

799

class CorruptRepository(BzrNewError):

796

800

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

797

801

Please run bzr reconcile on this repository."""

Older »