Fossil

Diff
Login

Diff

Differences From Artifact [ecadfa6243]:

To Artifact [46c32865c3]:


440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
440
441
442
443
444
445
446

447
448
449
450
451
452
453







-







      diff_print_index(zNew, diffFlags, 0);
      isBin2 = 0;
      if( fBaseline ){
        content_get(rid, &a);
        isBin1 = fIncludeBinary ? 0 : looks_like_binary(&a);
        diff_file_mem(&a, &empty, isBin1, isBin2, zOrig, zDiffCmd,
                      zBinGlob, fIncludeBinary, diffFlags);
      }else{
      }
    }else{
      Blob delta;
      int isOrigLink = file_islink(zOPath);
      db_ephemeral_blob(&q, 6, &delta);
      fossil_print("CHANGED %s\n", zNew);
      if( !isOrigLink != !isLink ){
470
471
472
473
474
475
476
477

478
479
480
481
482
483
484
469
470
471
472
473
474
475

476
477
478
479
480
481
482
483







-
+







              zBinGlob, fIncludeBinary, diffFlags, 1, 0);
        }
        blob_reset(&a);
        blob_reset(&b);
      }
      blob_reset(&delta);
    }
 }
  }
  db_finalize(&q);
}

/*
** Drop the indicated stash
*/
static void stash_drop(int stashid){