← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bundle/serializer/v4.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2008-04-30 06:54:40 UTC
  • mfrom: (3380.1.16 make-it-right)
  • Revision ID: pqm@pqm.ubuntu.com-20080430065440-1l8693padc4f7uho
(abentley) Fix fetch from non-rich-root to rich-root

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bundle/serializer/v4.py
588
588
    def _install_revision(self, revision_id, metadata, text):
589
589
        if self._repository.has_revision(revision_id):
590
590
            return
591
 
        self._repository._add_revision_text(revision_id, text)
 
591
        if self._info['serializer'] == self._repository._serializer.format_num:
 
592
            self._repository._add_revision_text(revision_id, text)
 
593
        else:
 
594
            revision = self._source_serializer.read_revision_from_string(text)
 
595
            self._repository.add_revision(revision.revision_id, revision)
592
596
 
593
597
    def _install_signature(self, revision_id, metadata, text):
594
598
        transaction = self._repository.get_transaction()