Differences From:

File src/merge.c part of check-in [36b96b8616] - Rework the merge algorithm. It now only works for text files. But, it no longer gets confused by line endings (\r\n versus \n) and it reports conflicts. by drh on 2007-11-16 20:42:31. Also file src/merge.c part of check-in [d0305b305a] - Merged mainline into my branch to get the newest application. by aku on 2007-12-05 08:07:46. [view]

To:

File src/merge.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/merge.c part of check-in [76bc05d739] - merge with trunk by btheado on 2009-12-30 20:33:59. [view]

@@ -78,9 +78,9 @@
   }
   if( pid>1 && !db_exists("SELECT 1 FROM plink WHERE cid=%d", pid) ){
     fossil_panic("not a version: record #%d", mid);
   }
-  vfile_check_signature(vid);
+  vfile_check_signature(vid, 1);
   db_begin_transaction();
   undo_begin();
   load_vfile_from_rid(mid);
   load_vfile_from_rid(pid);