WindWoes [was: Update problems on Windows: $#"@! svn_path_local_style]

Man oh man ... and to think we all thought that path style magic was a
neat idea.

O.K., I apply Mike's patch and try a small "svn up" ... Hey, it's
actually pulling things off the serv -- Oh, it crashed. Hmmm (debug
debug trace trace) ... what, a NULL entry? Why is it trying to set the
current revision on .\./install.sh? ... Aha!

* subversion/libsvn_wc/adm_ops.c
(svn_wc__ensure_uniform_revision): Use svn_path_local_style.

diff -up subversion/libsvn_wc/SVN/text-base/adm_ops.c subversion/libsvn_wc/adm_ops.c
--- subversion/libsvn_wc/SVN/text-base/adm_ops.c Thu Sep 6 21:46:31 2001
+++ subversion/libsvn_wc/adm_ops.c Thu Sep 6 22:26:54 2001
@@ -115,7 +115,7 @@ svn_wc__ensure_uniform_revision (svn_str
       full_entry_path = svn_stringbuf_dup (dir_path, subpool);
       if (current_entry_name)
         svn_path_add_component (full_entry_path, current_entry_name,
- svn_path_url_style);
+ svn_path_local_style);

       /* If the entry's existence is `deleted', remove the entry
          altogether. (If, during the update, the repository didn't

Wow, I can update the whole tree now, how cool. Right. I have a few
small changes in my WC, let's commit those:

$ svn ci svn_private_config.h -m "(SVN_VERSION): Bump to M3."

apr_error: #22623, src_err 0 : <The filename, directory name, or volume label syntax is incorrect. >
  svn_wc__wcprop_get: failed to load props from disk.

apr_error: #22623, src_err 0 : <The filename, directory name, or volume label syntax is incorrect. >
  svn_io_check_path: problem checking path "c:/Home/brane/sources/subversion/svn-repo/trunk\."

Eh? (debug debug trace trace) Oh, look what I found. Naughty, naughty.

* subversion/libsvn_subr/target.c
(svn_path_get_absolute): Really pass some flags to apr_filepath_merge.

diff -up subversion/libsvn_subr/SVN/text-base/target.c subversion/libsvn_subr/target.c
--- subversion/libsvn_subr/SVN/text-base/target.c Thu Sep 6 21:46:12 2001
+++ subversion/libsvn_subr/target.c Thu Sep 6 23:01:53 2001
@@ -39,9 +39,10 @@ svn_path_get_absolute(svn_stringbuf_t **
 {
   char * buffer;
   int apr_err = apr_filepath_merge(&buffer, NULL, relative->data,
- APR_FILEPATH_NOTRELATIVE &
- APR_FILEPATH_NATIVE &
- APR_FILEPATH_TRUENAME, pool);
+ APR_FILEPATH_NOTRELATIVE
+ | APR_FILEPATH_NATIVE
+ | APR_FILEPATH_TRUENAME,
+ pool);
   if (apr_err == APR_SUCCESS)
     {
       *pabsolute = svn_stringbuf_create(buffer, pool);

O.K., committing again. What? Same error? Howzat? Aargh ... saith
apr/file_io/win32/filesys.c:

> /* ###: We really should consider adding a flag to allow the user
> * to have the APR_FILEPATH_NATIVE result
> */
> for (*rootpath = path; **rootpath; ++*rootpath) {
> if (**rootpath == '\\')
> **rootpath = '/';
> }

That's it. I'm not touching this stuff again today. I'll just post those
patches to the list and let somebody else commit, thanks. Why aren't I
using "svn diff", you ask? Oh, because it doesn't work for me right now,
of course. Always shows an empty diff.

BTW, see issues 488 and 489,

-- 
Brane �ibej   <brane_at_xbc.nu>            http://www.xbc.nu/brane/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org