# 
# patch "commands.cc"
#  from [62820266c5824e04d6cde994b2eb3883dbf3d7ee]
#    to [cf2b8b5158dc35b88b515c38c255d8ff5664ee35]
# 
# patch "file_io.cc"
#  from [869ea7e766d7e73fa05fa6d46f9bb4b50550aa8a]
#    to [bee48ec2124a96b5e5058a31781e263bc4550ba3]
# 
========================================================================
--- commands.cc	62820266c5824e04d6cde994b2eb3883dbf3d7ee
+++ commands.cc	cf2b8b5158dc35b88b515c38c255d8ff5664ee35
@@ -3430,7 +3430,7 @@
   if (args.size() != 1)
     throw usage(name);
 
-  import_cvs_repo(system_path(idx(args, 0)), app);
+  import_cvs_repo(system_path(idx(args, 0))(), app);
 }
 
 CMD(git, N_("git"),
========================================================================
--- file_io.cc	869ea7e766d7e73fa05fa6d46f9bb4b50550aa8a
+++ file_io.cc	bee48ec2124a96b5e5058a31781e263bc4550ba3
@@ -485,8 +485,8 @@
       walker.visit_file(path);
       break;
     case path::directory:
-      walk_tree_recursive(mkdir(system_path(path)),
-                          mkdir(path),
+      walk_tree_recursive(system_path(path).as_external(),
+                          path.as_external(),
                           walker);
       break;
     }