~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/repository.py

  • Committer: Andrew Bennetts
  • Date: 2009-08-13 00:20:29 UTC
  • mto: This revision was merged to the branch mainline in revision 4608.
  • Revision ID: andrew.bennetts@canonical.com-20090813002029-akc5x2mtxa8rq068
Raise InventoryDeltaErrors, not generic BzrErrors, from inventory_delta.py.

Show diffs side-by-side

added added

removed removed

Lines of Context:
4235
4235
            try:
4236
4236
                parse_result = deserialiser.parse_text_bytes(
4237
4237
                    inventory_delta_bytes)
4238
 
            except inventory_delta._IncompatibleDelta, err:
 
4238
            except inventory_delta.IncompatibleInventoryDelta, err:
4239
4239
                trace.mutter("Incompatible delta: %s", err.msg)
4240
4240
                raise errors.IncompatibleRevision(self.target_repo._format)
4241
4241
            basis_id, new_id, rich_root, tree_refs, inv_delta = parse_result