# 
# patch "ChangeLog"
#  from [f58f51b0e61938788c1c383f434efa2d0878d009]
#    to [a4fa1fe7aa01cab397b9f7e7ada4d747e67f5c16]
# 
# patch "change_set.cc"
#  from [372e488086225b937d7de33611e374edc07d3922]
#    to [013bd7f4b246de06f042eb29f6bd67d820aabb8f]
# 
# patch "database.cc"
#  from [b160ec3991f2e2b57e8bcdc46c4a90da34c34ecf]
#    to [bd63c3041845f0e78fe70bd8e994b3abe202a215]
# 
# patch "monotone.cc"
#  from [b21691fb1cf0958c721eb88c076173ec836cb36b]
#    to [ba50c06786da77dec73570531a31d500616ef492]
# 
========================================================================
--- ChangeLog	f58f51b0e61938788c1c383f434efa2d0878d009
+++ ChangeLog	a4fa1fe7aa01cab397b9f7e7ada4d747e67f5c16
@@ -1,5 +1,11 @@
 2005-08-24  Nathaniel Smith  <address@hidden>
 
+	* change_set.cc (print_insane_path_rearrangement): 
+	* database.cc (initialize): 
+	* monotone.cc (cpp_main): More small compile fixes.
+
+2005-08-24  Nathaniel Smith  <address@hidden>
+
 	* file_io.hh
 	({assert,require}_path_is_{nonexistent,file,directory}): New
 	functions.
========================================================================
--- change_set.cc	372e488086225b937d7de33611e374edc07d3922
+++ change_set.cc	013bd7f4b246de06f042eb29f6bd67d820aabb8f
@@ -2823,7 +2823,7 @@
        i != pr.deleted_files.end(); ++i)
     {
       basic_io::stanza st;
-      st.push_str_pair(syms::delete_file, *i);
+      st.push_file_pair(syms::delete_file, *i);
       printer.print_stanza(st);
     }
 
@@ -2831,7 +2831,7 @@
        i != pr.deleted_dirs.end(); ++i)
     {
       basic_io::stanza st;
-      st.push_str_pair(syms::delete_dir, *i);
+      st.push_file_pair(syms::delete_dir, *i);
       printer.print_stanza(st);
     }
 
@@ -2839,8 +2839,8 @@
        i != pr.renamed_files.end(); ++i)
     {
       basic_io::stanza st;
-      st.push_str_pair(syms::rename_file, i->first);
-      st.push_str_pair(syms::to, i->second);
+      st.push_file_pair(syms::rename_file, i->first);
+      st.push_file_pair(syms::to, i->second);
       printer.print_stanza(st);
     }
 
========================================================================
--- database.cc	b160ec3991f2e2b57e8bcdc46c4a90da34c34ecf
+++ database.cc	bd63c3041845f0e78fe70bd8e994b3abe202a215
@@ -202,9 +202,9 @@
   if (__sql)
     throw oops("cannot initialize database while it is open");
 
-  N(!path_state(filename),
-    F("could not initialize database: %s: already exists") 
-    % filename);
+  require_path_is_nonexistent(filename,
+                              F("could not initialize database: %s: already exists") 
+                              % filename);
 
   system_path journal(filename.as_internal() + "-journal");
   require_path_is_nonexistent(journal,
========================================================================
--- monotone.cc	b21691fb1cf0958c721eb88c076173ec836cb36b
+++ monotone.cc	ba50c06786da77dec73570531a31d500616ef492
@@ -320,7 +320,7 @@
               break;
 
             case OPT_RCFILE:
-              app.add_rcfile(argstr);
+              app.add_rcfile(string(argstr));
               break;
 
             case OPT_DUMP: