Fossil

Diff
Login

Diff

Differences From Artifact [db86f7df88]:

To Artifact [06e5d6c181]:


360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
        content_get(rid, &a);
        blob_delta_apply(&a, &delta, &b);
        int eType2 = 0;
        if( !fIncludeBinary ){
          eType = looks_like_text(pBase);
          eType2 = looks_like_text(&b);
        }
        if( eType!=eType2 ){
          diff_print_filenames(zOrig, zNew, diffFlags);
          printf(DIFF_CANNOT_COMPUTE_ENCODING);
        }else{
          diff_file_mem(pBase, &b, eType, zNew, zDiffCmd,
                        zBinGlob, fIncludeBinary, diffFlags);
        }
        blob_reset(&a);







|







360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
        content_get(rid, &a);
        blob_delta_apply(&a, &delta, &b);
        int eType2 = 0;
        if( !fIncludeBinary ){
          eType = looks_like_text(pBase);
          eType2 = looks_like_text(&b);
        }
        if( DIFFERENT_ENCODING(eType, eType2) ){
          diff_print_filenames(zOrig, zNew, diffFlags);
          printf(DIFF_CANNOT_COMPUTE_ENCODING);
        }else{
          diff_file_mem(pBase, &b, eType, zNew, zDiffCmd,
                        zBinGlob, fIncludeBinary, diffFlags);
        }
        blob_reset(&a);