# 
# 
# patch "ChangeLog"
#  from [035028477dfee9b0b9c65ae3ae87ffde10441e7b]
#    to [8ae8207471b974a1918ef0b6bbac2359f43a197a]
# 
# patch "work.cc"
#  from [974c732d3974dc1c349e6e62e76047482e17b22d]
#    to [2c981ac1c673016518f143290d22cdeb533461d9]
# 
============================================================
--- ChangeLog	035028477dfee9b0b9c65ae3ae87ffde10441e7b
+++ ChangeLog	8ae8207471b974a1918ef0b6bbac2359f43a197a
@@ -1,3 +1,8 @@
+2006-05-04  Matt Johnston  <address@hidden>
+
+  * work.cc (editable_working_tree::apply_delta): filename argument
+  was missing for E() format string.
+
 2006-05-02  Richard Levitte  <address@hidden>
 
 	* po/sv.po: A few new strings to translate.
============================================================
--- work.cc	974c732d3974dc1c349e6e62e76047482e17b22d
+++ work.cc	2c981ac1c673016518f143290d22cdeb533461d9
@@ -1033,7 +1033,7 @@
   calculate_ident(pth_unsplit, curr_id_raw, app.lua);
   file_id curr_id(curr_id_raw);
   E(curr_id == old_id,
-    F("content of file '%s' has changed, not overwriting"));
+    F("content of file '%s' has changed, not overwriting") % pth_unsplit);
   P(F("updating %s") % pth_unsplit);
 
   file_data dat;