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 [76f169fca6] - Detect when the check-out contains missing files and filesystem objects that ought to be files but are not. Issue reasonable warnings. by drh on 2009-12-18 00:29:51. Also file src/diffcmd.c part of check-in [76bc05d739] - merge with trunk by btheado on 2009-12-30 20:33:59. [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);
 }
@@ -208,9 +208,9 @@
   Blob sql;
   Stmt q;
 
   vid = db_lget_int("checkout", 0);
-  vfile_check_signature(vid);
+  vfile_check_signature(vid, 1);
   blob_zero(&sql);
   db_begin_transaction();
   if( zFrom ){
     int rid = name_to_rid(zFrom);
@@ -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);