Diff
Not logged in

Differences From:

File src/diffcmd.c part of check-in [fe8bb01d38] - Add the ability to diff to arbitrary versions of a single file. by drh on 2009-11-06 14:00:38. [view]

To:

File src/diffcmd.c part of check-in [7b82a73bd3] - Remove the --yes option from the "revert" command. In its place, make the "revert" opration undoable. by drh on 2009-12-17 21:22:52. [view]

@@ -191,9 +191,9 @@
 static void diff_one_against_disk(const char *zFrom, const char *zDiffCmd){
   Blob fname;
   Blob content;
   file_tree_name(g.argv[2], &fname, 1);
-  historical_version_of_file(zFrom, blob_str(&fname), &content);
+  historical_version_of_file(zFrom, blob_str(&fname), &content, 0);
   diff_file(&content, g.argv[2], g.argv[2], zDiffCmd);
   blob_reset(&content);
   blob_reset(&fname);
 }
@@ -296,10 +296,10 @@
   Blob fname;
   Blob v1, v2;
   file_tree_name(g.argv[2], &fname, 1);
   zName = blob_str(&fname);
-  historical_version_of_file(zFrom, zName, &v1);
-  historical_version_of_file(zTo, zName, &v2);
+  historical_version_of_file(zFrom, zName, &v1, 0);
+  historical_version_of_file(zTo, zName, &v2, 0);
   diff_file_mem(&v1, &v2, zName, zDiffCmd);
   blob_reset(&v1);
   blob_reset(&v2);
   blob_reset(&fname);