Overview
Artifact ID: | e69e7a37e38c5d554b158eb73969bc8ca57294e0 |
---|---|
Ticket: | 1457156b277688cf495142a8211a0c93eeda558c
"fossil gdiff" uses internal diff under some conditions |
User & Date: | altufaltu 2010-01-15 09:30:28 |
Changes
- Appended to comment:
<hr><i>altufaltu added on 2010-01-15 09:30:28:</i><br> Here is the patch, if somebody is interested: <verbatim> --- src/diffcmd.c +++ src/diffcmd.c @@ -267,13 +267,14 @@ printf("ADDED_BY_MERGE %s\n", zPathname); }else{ int srcid = db_column_int(&q, 4); Blob content; content_get(srcid, &content); - printf("Index: %s\n=======================================" - "============================\n", - zPathname + if (!zDiffCmd) + printf("Index: %s\n=======================================" + "============================\n", + zPathname ); diff_file(&content, zFullName, zPathname, zDiffCmd); blob_reset(&content); } free(zFullName); @@ -353,11 +354,11 @@ zTo = find_option("to", 0, 1); if( zTo==0 ){ db_must_be_within_tree(); verify_all_options(); - if( !isInternDiff && g.argc==3 ){ + if( !isInternDiff ){ zDiffCmd = db_get(isGDiff ? "gdiff-command" : "diff-command", 0); } if( g.argc==3 ){ diff_one_against_disk(zFrom, zDiffCmd); }else{ </verbatim>