Rev 3905: Remove an invalid assert. in http://bzr.arbash-meinel.com/branches/bzr/brisbane/gc_delta_index_room

[John Arbash Meinel]

At http://bzr.arbash-meinel.com/branches/bzr/brisbane/gc_delta_index_room

------------------------------------------------------------
revno: 3905
revision-id: john at arbash-meinel.com-20090319145132-e7eu3p75btuidhu2
parent: john at arbash-meinel.com-20090319144153-y4m58rs011omd0g3
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: gc_delta_index_room
timestamp: Thu 2009-03-19 09:51:32 -0500
message:
  Remove an invalid assert.
  
  The assert is only valid if we grow at most by 1 level,
  with the new limitation of forcing the hsize, we can
  grow by a lot more than that. (f=>ff).
  Rather than writing a new assert that fits all cases, just
  remove it.
-------------- next part --------------
=== modified file 'bzrlib/diff-delta.c'
--- a/bzrlib/diff-delta.c	2009-03-19 14:41:53 +0000
+++ b/bzrlib/diff-delta.c	2009-03-19 14:51:32 +0000
@@ -591,13 +591,6 @@
                  entry < old_index->hash[j+1] && entry->ptr != NULL;
                  ++entry) {
                 assert((entry->val & old_index->hash_mask) == j);
-                // if (!(j == i || j + old_index->hash_mask + 1 == i)) {
-                //     fprintf(stderr, "Old hash entry %x"
-                //                     " doesn't fit with new %x\n"
-                //                     "old_mask: %x new_mask: %x\n",
-                //                     j, i, old_index->hash_mask, hmask);
-                // }
-                assert(j == i || j + old_index->hash_mask + 1 == i);
                 if ((entry->val & hmask) == i) {
                     /* Any entries not picked up here will be picked up on the
                      * next pass.