~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/repository.py

  • Committer: Aaron Bentley
  • Date: 2006-09-22 01:05:30 UTC
  • mto: This revision was merged to the branch mainline in revision 2048.
  • Revision ID: aaron.bentley@utoronto.ca-20060922010530-632a5f35fb488eb2
Ensure that new-model revisions aren't installed into old-model repos

Show diffs side-by-side

added added

removed removed

Lines of Context:
780
780
    entries = inv.iter_entries()
781
781
    # backwards compatability hack: skip the root id.
782
782
    if not repository._format.rich_root_data:
783
 
        entries.next()
 
783
        path, root = entries.next()
 
784
        if root.revision != rev.revision_id:
 
785
            raise errors.IncompatibleRevision(
 
786
                repository._format.get_format_description())
784
787
    # Add the texts that are not already present
785
788
    for path, ie in entries:
786
789
        w = repository.weave_store.get_weave_or_empty(ie.file_id,