SHA1 Hash:	ac1dea8eac8d3e94d44da33bb0bf4f9f1fd6e649
Date:	2007-07-24 13:00:19
User:	drh
Comment:	Fix a bug in the "rm" command. Delete an obsolete documentation file.
Timelines:	ancestors | descendants | both | trunk
Other Links:	files | ZIP archive | manifest

• branch=trunk inherited from [a28c83647d]
• sym-trunk inherited from [a28c83647d]

Modified src/checkin.c from [08d87760e9] to [f97001dc6f].

@@ -271,11 +271,11 @@
   zDate = db_text(0, "SELECT datetime('now')");
   zDate[10] = 'T';
   blob_appendf(&manifest, "D %s\n", zDate);
   db_prepare(&q,
     "SELECT pathname, uuid FROM vfile JOIN blob USING (rid)"
-    " WHERE vfile.vid=%d"
+    " WHERE NOT deleted AND vfile.vid=%d"
     " ORDER BY 1", vid);
   while( db_step(&q)==SQLITE_ROW ){
     const char *zName = db_column_text(&q, 0);
     const char *zUuid = db_column_text(&q, 1);
     blob_appendf(&manifest, "F %F %s\n", zName, zUuid);
@@ -312,11 +312,11 @@
   content_deltify(vid, nvid, 0);
   zUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", nvid);
   printf("New_Version: %s\n", zUuid);
 
   /* Update VFILE */
-  db_multi_exec("DELETE FROM vfile WHERE vid!=%d", vid);
+  db_multi_exec("DELETE FROM vfile WHERE vid!=%d OR deleted", vid);
   db_multi_exec("DELETE FROM vmerge");
   db_multi_exec("UPDATE vfile SET vid=%d, rid=mrid, chnged=0, deleted=0", nvid);
   db_lset_int("checkout", nvid);
 
   /* Verify that the tree checksum is unchanged */

Deleted www/base32.html version [73c6806746]