Comment 9 for bug 422849

Revision history for this message
Robert Collins (lifeless) wrote : Re: InterDifferingSerializer generates InconsistentDelta error upgrading drizzle repo to 2a - adds a file already versioned

=== modified file 'bzrlib/repository.py'
--- bzrlib/repository.py 2009-08-30 22:02:45 +0000
+++ bzrlib/repository.py 2009-09-01 23:10:56 +0000
@@ -3844,6 +3844,9 @@
                 possible_trees.append((basis_id, cache[basis_id]))
             basis_id, delta = self._get_delta_for_revision(tree, parent_ids,
                                                            possible_trees)
+ revision = self.source.get_revision(current_revision_id)
+ pending_deltas.append((basis_id, delta,
+ current_revision_id, revision.parent_ids))
             if self._converting_to_rich_root:
                 self._revision_id_to_root_id[current_revision_id] = \
                     tree.get_root_id()
@@ -3878,9 +3881,6 @@
                     if entry.revision == file_revision:
                         texts_possibly_new_in_tree.remove(file_key)
             text_keys.update(texts_possibly_new_in_tree)
- revision = self.source.get_revision(current_revision_id)
- pending_deltas.append((basis_id, delta,
- current_revision_id, revision.parent_ids))
             pending_revisions.append(revision)
             cache[current_revision_id] = tree
             basis_id = current_revision_id