← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/diff-delta.c

  • Committer: John Arbash Meinel
  • Date: 2009-03-19 14:51:32 UTC
  • mto: (3735.2.157 brisbane-core)
  • mto: This revision was merged to the branch mainline in revision 4280.
  • Revision ID: john@arbash-meinel.com-20090319145132-e7eu3p75btuidhu2
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.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/diff-delta.c
591
591
                 entry < old_index->hash[j+1] && entry->ptr != NULL;
592
592
                 ++entry) {
593
593
                assert((entry->val & old_index->hash_mask) == j);
594
 
                // if (!(j == i || j + old_index->hash_mask + 1 == i)) {
595
 
                //     fprintf(stderr, "Old hash entry %x"
596
 
                //                     " doesn't fit with new %x\n"
597
 
                //                     "old_mask: %x new_mask: %x\n",
598
 
                //                     j, i, old_index->hash_mask, hmask);
599
 
                // }
600
 
                assert(j == i || j + old_index->hash_mask + 1 == i);
601
594
                if ((entry->val & hmask) == i) {
602
595
                    /* Any entries not picked up here will be picked up on the
603
596
                     * next pass.