# 
# patch "ChangeLog"
#  from [5105c3b41db4917d02c583022800980234dca890]
#    to [52c8f41ae2d431d27c705c07aedef5c27eb7157a]
# 
# patch "app_state.cc"
#  from [e9c1fc2b7db033ec7a595f2d555d981d7058e788]
#    to [b07a5acad697fc9899d5a36ca5d41645175267ee]
# 
# patch "change_set.cc"
#  from [013bd7f4b246de06f042eb29f6bd67d820aabb8f]
#    to [b64c1384065796cc2ac05306e44e1d67db8d3146]
# 
========================================================================
--- ChangeLog	5105c3b41db4917d02c583022800980234dca890
+++ ChangeLog	52c8f41ae2d431d27c705c07aedef5c27eb7157a
@@ -1,5 +1,13 @@
 2005-08-24  Nathaniel Smith  <address@hidden>
 
+	* app_state.cc (allow_working_copy): 
+	* change_set.cc (print_insane_change_set): Two more small compile
+	fixes.
+	All remaining compile errors are localized to unimplemented
+	paths.cc/file_io.cc functionality.
+
+2005-08-24  Nathaniel Smith  <address@hidden>
+
 	* database.cc (initialize): Missing ;.
 
 2005-08-24  Nathaniel Smith  <address@hidden>
========================================================================
--- app_state.cc	e9c1fc2b7db033ec7a595f2d555d981d7058e788
+++ app_state.cc	b07a5acad697fc9899d5a36ca5d41645175267ee
@@ -48,7 +48,7 @@
 void
 app_state::allow_working_copy()
 {
-  fs::path root = mkpath(search_root());
+  fs::path root = mkpath(search_root.as_external());
   fs::path working;
   fs::path current;
 
@@ -81,7 +81,7 @@
           bookkeeping_path dump_path;
           get_local_dump_path(dump_path);
           L(F("setting dump path to %s\n") % dump_path);
-          global_sanity.filename = dump_path;
+          global_sanity.filename = system_path(dump_path);
         }
     }
   load_rcfiles();
========================================================================
--- change_set.cc	013bd7f4b246de06f042eb29f6bd67d820aabb8f
+++ change_set.cc	b64c1384065796cc2ac05306e44e1d67db8d3146
@@ -2904,7 +2904,7 @@
        i != cs.deltas.end(); ++i)
     {
       basic_io::stanza st;
-      st.push_str_pair(syms::patch, i->first);
+      st.push_file_pair(syms::patch, i->first);
       st.push_hex_pair(syms::from, i->second.first.inner()());
       st.push_hex_pair(syms::to, i->second.second.inner()());
       printer.print_stanza(st);