← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/repository.py

  • Committer: Andrew Bennetts
  • Date: 2009-08-04 14:07:42 UTC
  • mto: This revision was merged to the branch mainline in revision 4608.
  • Revision ID: andrew.bennetts@canonical.com-20090804140742-elu5athah3e0s4uj
Fix deserialization of deletes in inventory deltas, don't give up on serialized deltas from a supports_tree_refs repo unless the delta contains tree refs, and experiment to add automatic_root param to branchbuilder.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/repository.py
4055
4055
            if rich_root and not target_rich_root:
4056
4056
                raise errors.IncompatibleRevision(self.target_repo._format)
4057
4057
            if tree_refs and not target_tree_refs:
4058
 
                raise errors.IncompatibleRevision(self.target_repo._format)
 
4058
                # The source supports tree refs and the target doesn't.  Check
 
4059
                # the delta for tree refs; if it has any we can't insert it.
 
4060
                for delta_item in inv_delta:
 
4061
                    entry = delta_item[3]
 
4062
                    if entry.kind == 'tree-reference':
 
4063
                        raise errors.IncompatibleRevision(self.target_repo._format)
4059
4064
            #revision_id = new_id[0]
4060
4065
            revision_id = new_id
4061
4066
            parents = [key[0] for key in record.parents]