← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/repository.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-09-02 09:06:16 UTC
  • mfrom: (4665.1.1 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20090902090616-8h9ung293q3zp4m0
(robertc) Merge 2.0 tip, including bugfix 422849,
        generate correct deltas when upgrading locally.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/repository.py
3844
3844
                possible_trees.append((basis_id, cache[basis_id]))
3845
3845
            basis_id, delta = self._get_delta_for_revision(tree, parent_ids,
3846
3846
                                                           possible_trees)
 
3847
            revision = self.source.get_revision(current_revision_id)
 
3848
            pending_deltas.append((basis_id, delta,
 
3849
                current_revision_id, revision.parent_ids))
3847
3850
            if self._converting_to_rich_root:
3848
3851
                self._revision_id_to_root_id[current_revision_id] = \
3849
3852
                    tree.get_root_id()
3878
3881
                    if entry.revision == file_revision:
3879
3882
                        texts_possibly_new_in_tree.remove(file_key)
3880
3883
            text_keys.update(texts_possibly_new_in_tree)
3881
 
            revision = self.source.get_revision(current_revision_id)
3882
 
            pending_deltas.append((basis_id, delta,
3883
 
                current_revision_id, revision.parent_ids))
3884
3884
            pending_revisions.append(revision)
3885
3885
            cache[current_revision_id] = tree
3886
3886
            basis_id = current_revision_id