=== 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
=== modified file 'bzrlib/ repository. py' repository. py 2009-08-30 22:02:45 +0000 repository. py 2009-09-01 23:10:56 +0000
possible_ trees.append( (basis_ id, cache[basis_id]))
basis_ id, delta = self._get_ delta_for_ revision( tree, parent_ids,
possible_ trees) get_revision( current_ revision_ id) deltas. append( (basis_ id, delta, revision_ id, revision. parent_ ids)) g_to_rich_ root:
self. _revision_ id_to_root_ id[current_ revision_ id] = \
tree.get_ root_id( )
if entry.revision == file_revision:
texts_ possibly_ new_in_ tree.remove( file_key)
text_ keys.update( texts_possibly_ new_in_ tree) get_revision( current_ revision_ id) deltas. append( (basis_ id, delta, revision_ id, revision. parent_ ids))
pending_ revisions. append( revision)
cache[ current_ revision_ id] = tree
basis_ id = current_revision_id
--- bzrlib/
+++ bzrlib/
@@ -3844,6 +3844,9 @@
+ revision = self.source.
+ pending_
+ current_
if self._convertin
@@ -3878,9 +3881,6 @@
- revision = self.source.
- pending_
- current_