448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
|
printf(DIFF_CANNOT_COMPUTE_SYMLINK);
}else{
content_get(rid, &a);
blob_delta_apply(&a, &delta, &b);
if( fBaseline ){
diff_file_mem(&a, &b, zNew, pCfg);
}else{
/*Diff with file on disk using fSwapDiff=1 to show the diff in the
same direction as if fBaseline=1.*/
diff_file(&b, zOPath, zNew, pCfg, 1, 0);
}
blob_reset(&a);
blob_reset(&b);
}
blob_reset(&delta);
}
}
|
|
<
|
>
|
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
|
printf(DIFF_CANNOT_COMPUTE_SYMLINK);
}else{
content_get(rid, &a);
blob_delta_apply(&a, &delta, &b);
if( fBaseline ){
diff_file_mem(&a, &b, zNew, pCfg);
}else{
pCfg->diffFlags ^= DIFF_INVERT;
diff_file(&b, zOPath, zNew, pCfg, 0);
pCfg->diffFlags ^= DIFF_INVERT;
}
blob_reset(&a);
blob_reset(&b);
}
blob_reset(&delta);
}
}
|