Index: win-tests.py
===================================================================
--- win-tests.py	(revision 19632)
+++ win-tests.py	(working copy)
@@ -165,11 +165,11 @@
   cp = ConfigParser.ConfigParser()
   cp.read('gen-make.opts')
   apr_path = get(cp, 'options', '--with-apr', 'apr')
-  apr_dll_path = os.path.join(apr_path, objdir, 'libapr.dll')
+  apr_dll_path = os.path.join(apr_path, objdir, 'libapr-1.dll')
   aprutil_path = get(cp, 'options', '--with-apr-util', 'apr-util')
-  aprutil_dll_path = os.path.join(aprutil_path, objdir, 'libaprutil.dll')
+  aprutil_dll_path = os.path.join(aprutil_path, objdir, 'libaprutil-1.dll')
   apriconv_path = get(cp, 'options', '--with-apr-iconv', 'apr-iconv')
-  apriconv_dll_path = os.path.join(apriconv_path, objdir, 'libapriconv.dll')
+  apriconv_dll_path = os.path.join(apriconv_path, objdir, 'libapriconv-1.dll')
   apriconv_so_path = os.path.join(apriconv_path, objdir, 'iconv')
 
   copy_changed_file(apr_dll_path, abs_objdir)
Index: subversion/libsvn_subr/io.c
===================================================================
--- subversion/libsvn_subr/io.c	(revision 19632)
+++ subversion/libsvn_subr/io.c	(working copy)
@@ -1263,6 +1263,23 @@
 
   SVN_ERR(svn_path_cstring_from_utf8(&path_apr, path, pool));
 
+#ifdef WIN32
+      {
+        apr_fileattrs_t attributes = APR_FILE_ATTR_READONLY;
+
+        if (enable_write)
+          attributes = 0;
+        status = apr_file_attrs_set(path_apr, attributes,
+                                    APR_FILE_ATTR_READONLY, pool);
+        if (status)
+          return svn_error_wrap_apr(status,
+                                    _("Can't change readonly attribute of "
+                                      "file '%s'"),
+                                    svn_path_local_style(path, pool));
+        return SVN_NO_ERROR;
+      }
+#endif
+
   /* Try to change only a minimal amount of the perms first 
      by getting the current perms and adding execute bits
      only on where read perms are granted.  If this fails
@@ -1355,6 +1372,10 @@
   apr_status_t status;
   const char *path_apr;
 
+#ifdef WIN32
+  return SVN_NO_ERROR;
+#endif
+
   SVN_ERR(svn_path_cstring_from_utf8(&path_apr, path, pool));
 
   if (executable)