# 
# patch "ChangeLog"
#  from [14c949f934bdc8eb70186ad02c92866c2ef5d006]
#    to [681fccb33bb7bd34e90a6077c0c0eb2bfa2b631e]
# 
# patch "commands.cc"
#  from [070e8916520a3fac640ca73ad770f848fc1e4c39]
#    to [94f4c9c04cf33f1d331b529ab7461d892b09dab2]
# 
# patch "mkstemp.cc"
#  from [eedaf747dc8c315ef2b07ed9101069ade982ddd4]
#    to [77d082245a338259686fa4b152fd36e90da9f275]
# 
========================================================================
--- ChangeLog	14c949f934bdc8eb70186ad02c92866c2ef5d006
+++ ChangeLog	681fccb33bb7bd34e90a6077c0c0eb2bfa2b631e
@@ -1,5 +1,10 @@
 2005-08-23  Nathaniel Smith  <address@hidden>
 
+	* commands.cc: Convert to paths.hh.
+	* mkstemp.cc (monotone_mkstemp): Likewise.
+
+2005-08-23  Nathaniel Smith  <address@hidden>
+
 	* vocab_terms.hh, vocab.cc: Remove file_path, local_path.
 	* database.{hh,cc}, monotone.cc: Convert to paths.hh.
 	* file_io.{hh,cc}: Start to convert to paths.hh.
========================================================================
--- commands.cc	070e8916520a3fac640ca73ad770f848fc1e4c39
+++ commands.cc	94f4c9c04cf33f1d331b529ab7461d892b09dab2
@@ -50,6 +50,7 @@
 #include "annotate.hh"
 #include "options.hh"
 #include "globish.hh"
+#include "paths.hh"
 
 //
 // this file defines the task-oriented "top level" commands which can be
@@ -2907,7 +2908,7 @@
       remaining = chosen_to_merged;
     }
   
-  local_path tmp_root((mkpath(book_keeping_dir) / mkpath("tmp")).string());
+  bookkeeping_path tmp_root("tmp");
   if (directory_exists(tmp_root))
     delete_dir_recursive(tmp_root);
 
@@ -3381,7 +3382,7 @@
   for (vector<utf8>::const_iterator i = args.begin();
        i != args.end(); ++i)
     {
-      test_parse_rcs_file(mkpath((*i)()), app.db);
+      test_parse_rcs_file(system_path((*i)()), app.db);
     }
 }
 
@@ -3392,7 +3393,7 @@
   if (args.size() != 1)
     throw usage(name);
 
-  import_cvs_repo(mkpath(idx(args, 0)()), app);
+  import_cvs_repo(system_path(idx(args, 0)()), app);
 }
 
 static void
========================================================================
--- mkstemp.cc	eedaf747dc8c315ef2b07ed9101069ade982ddd4
+++ mkstemp.cc	77d082245a338259686fa4b152fd36e90da9f275
@@ -48,9 +48,7 @@
       fd = open(tmp.c_str(), O_RDWR | O_CREAT | O_EXCL | O_BINARY, 0600);      
       if (fd >= 0)
       {
-        fs::path path;
-        path = mkpath(tmp);
-        tmpl = path.native_directory_string();
+        tmpl = tmp;
         return fd;
       }
       else if (errno != EEXIST)