# 
# patch "ChangeLog"
#  from [dd3fa203820e5ab2ee12feb7e10dfac859f0a755]
#    to [bd62ed9c670a1759002a2077e7ab89a0e4e15257]
# 
# patch "diff_patch.cc"
#  from [667b6faf980f57be57fbf88a600fc457d6974ded]
#    to [89a06ebf47d673514d2baad4b07046f3fa2941ad]
# 
# patch "lua.cc"
#  from [2e3108f8ec82ea73a605aa3ee1c60461220733c4]
#    to [f0e7ebb9ffcce6dda847a58dfb5ead6bebe6904d]
# 
# patch "rcs_import.cc"
#  from [aa25b973c3d4e38c3f7e7695ff5c270dc81ef338]
#    to [e2247c432ad596910055790ce381f10fefb40b60]
# 
========================================================================
--- ChangeLog	dd3fa203820e5ab2ee12feb7e10dfac859f0a755
+++ ChangeLog	bd62ed9c670a1759002a2077e7ab89a0e4e15257
@@ -1,5 +1,11 @@
 2005-08-25  Nathaniel Smith  <address@hidden>
 
+	* rcs_import.cc (import_cvs_repo): 
+	* lua.cc (default_rcfilename): 
+	* diff_patch.cc (get_version): Small compile fixes.
+
+2005-08-25  Nathaniel Smith  <address@hidden>
+
 	* paths.{cc,hh} (is_bookkeeping_path): New static method.
 	* file_io.cc (walk_tree_recursive): Use it.  Now compiles.
 	paths.cc and file_io.cc now compile.
========================================================================
--- diff_patch.cc	667b6faf980f57be57fbf88a600fc457d6974ded
+++ diff_patch.cc	89a06ebf47d673514d2baad4b07046f3fa2941ad
@@ -702,7 +702,7 @@
       file_id fid;
       require_path_is_file(path,
                            F("file '%s' does not exist in working copy") % path,
-                           F("'%s' in working copy is a directory, not a file") % path)
+                           F("'%s' in working copy is a directory, not a file") % path);
       read_localized_data(path, tmp, app.lua);
       calculate_ident(tmp, fid);
       N(fid == ident,
========================================================================
--- lua.cc	2e3108f8ec82ea73a605aa3ee1c60461220733c4
+++ lua.cc	f0e7ebb9ffcce6dda847a58dfb5ead6bebe6904d
@@ -653,7 +653,7 @@
 void 
 lua_hooks::default_rcfilename(system_path & file)
 {
-  file = get_homedir() / ".monotone/monotonerc";
+  file = system_path(get_homedir()) / ".monotone/monotonerc";
 }
 
 void 
========================================================================
--- rcs_import.cc	aa25b973c3d4e38c3f7e7695ff5c270dc81ef338
+++ rcs_import.cc	e2247c432ad596910055790ce381f10fefb40b60
@@ -1249,7 +1249,7 @@
                               F("path %s is not a directory") % cvsroot);
     app.db.ensure_open();
     change_current_working_dir(cvsroot);
-    walk_tree(walker);
+    walk_tree(file_path(), walker);
     guard.commit();
   }