svn commit: r950052 - /subversion/trunk/subversion/svn/util.c

[hw...@apache.org]

Author: hwright
Date: Tue Jun  1 12:59:22 2010
New Revision: 950052

URL: http://svn.apache.org/viewvc?rev=950052&view=rev
Log:
* subversion/svn/util.c
  (svn_cl__path_join): Use the appropriate path/uri joining function.

Modified:
    subversion/trunk/subversion/svn/util.c

Modified: subversion/trunk/subversion/svn/util.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/util.c?rev=950052&r1=950051&r2=950052&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/util.c (original)
+++ subversion/trunk/subversion/svn/util.c Tue Jun  1 12:59:22 2010
@@ -1294,5 +1294,8 @@ svn_cl__path_join(const char *base,
                   const char *component,
                   apr_pool_t *pool)
 {
-  return svn_path_join(base, component, pool);
+  if (svn_path_is_url(base))
+    return svn_uri_join(base, component, pool);
+  else
+    return svn_dirent_join(base, component, pool);
 }