# 
# 
# patch "ChangeLog"
#  from [7a82b889a48dd08ab42470919f1c7e79010b628e]
#    to [e8439c40fb8d6781275677145e6f0bb491731d4f]
# 
# patch "commands.cc"
#  from [de07658f84b0fb5c5c31cbf24edcd2adb7f836b6]
#    to [8001018c55d1fbf8b8f9f393c49b191852da61ae]
# 
============================================================
--- ChangeLog	7a82b889a48dd08ab42470919f1c7e79010b628e
+++ ChangeLog	e8439c40fb8d6781275677145e6f0bb491731d4f
@@ -1,5 +1,9 @@
 2006-04-20  Timtohy Brownawell  <address@hidden>
 
+	* commands.cc (commit): E() if the old end of a delta is missing.
+
+2006-04-20  Timtohy Brownawell  <address@hidden>
+
 	* tests/t_ls_changed.at: Also check that it detects added files/dirs.
 
 2006-04-20  Timtohy Brownawell  <address@hidden>
============================================================
--- commands.cc	de07658f84b0fb5c5c31cbf24edcd2adb7f836b6
+++ commands.cc	8001018c55d1fbf8b8f9f393c49b191852da61ae
@@ -2471,18 +2471,9 @@
                                        file_delta(del));
               }
             else
-              {
-                L(FL("inserting full version %s\n") % new_content);
-                data new_data;
-                read_localized_data(path, new_data, app.lua);
-                // sanity check
-                hexenc<id> tid;
-                calculate_ident(new_data, tid);
-                N(tid == new_content.inner(),
-                  F("file '%s' modified during commit, aborting")
-                  % path);
-                dbw.consume_file_data(new_content, file_data(new_data));
-              }
+              // If we don't err out here, our packet writer will later.
+              E(false, F("Your database is missing version %s of file '%s'")
+                         % old_content % path);
           }
 
         for (std::map<split_path, file_id>::const_iterator i = cs.files_added.begin();