Fossil

Differences From Artifact [6296c873ab]:

• File src/delta.c — part of check-in [6c8ed4e147] at 2010-10-25 21:16:43 on branch experimental — The "fossil revert" command now clears merge history. Less frequent status output on rebuild. The FOSSIL_OMIT_DELTA_CKSUM_TEST compile-time option is available. (user: drh size: 18674) [more...]

To Artifact [43dd95bcbe]:

• File src/delta.c — part of check-in [01c83bfbbf] at 2010-12-20 17:17:36 on branch mistake — This change was accidentally committed by a test script, specifically the test/merge5.test test script. There is some problem with "make test". (user: drh size: 18675) [more...]

436
437
438
439
440
441
442
443
444
445
446
447
448
449
450

          DEBUG2( printf("lastRead becomes %d\n", lastRead); )
        }
        bestCnt = 0;
        break;
      }

      /* If we reach this point, it means no match is found so far */
      if( base+i+NHASH>lenOut ){
        /* We have reached the end of the file and have not found any
        ** matches.  Do an "insert" for everything that does not match */
        putInt(lenOut-base, &zDelta);
        *(zDelta++) = ':';
        memcpy(zDelta, &zOut[base], lenOut-base);
        zDelta += lenOut-base;
        base = lenOut;

|

436
437
438
439
440
441
442
443
444
445
446
447
448
449
450

          DEBUG2( printf("lastRead becomes %d\n", lastRead); )
        }
        bestCnt = 0;
        break;
      }

      /* If we reach this point, it means no match is found so far */
      if( base+i+NHASH>=lenOut ){
        /* We have reached the end of the file and have not found any
        ** matches.  Do an "insert" for everything that does not match */
        putInt(lenOut-base, &zDelta);
        *(zDelta++) = ':';
        memcpy(zDelta, &zOut[base], lenOut-base);
        zDelta += lenOut-base;
        base = lenOut;