svn commit: r1773361 - /subversion/trunk/tools/client-side/svn-mergeinfo-normalizer/wc_mergeinfo.c

[ju...@apache.org]

Author: julianfoad
Date: Fri Dec  9 11:21:37 2016
New Revision: 1773361

URL: http://svn.apache.org/viewvc?rev=1773361&view=rev
Log:
Fix issue #4461, "svn-mergeinfo-normalizer assertion failure with
files/folders with embedded space(s)".

* tools/client-side/svn-mergeinfo-normalizer/wc_mergeinfo.c
  (get_urls): URI-decode the path portion of the URL.

Modified:
    subversion/trunk/tools/client-side/svn-mergeinfo-normalizer/wc_mergeinfo.c

Modified: subversion/trunk/tools/client-side/svn-mergeinfo-normalizer/wc_mergeinfo.c
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/client-side/svn-mergeinfo-normalizer/wc_mergeinfo.c?rev=1773361&r1=1773360&r2=1773361&view=diff
==============================================================================
--- subversion/trunk/tools/client-side/svn-mergeinfo-normalizer/wc_mergeinfo.c (original)
+++ subversion/trunk/tools/client-side/svn-mergeinfo-normalizer/wc_mergeinfo.c Fri Dec  9 11:21:37 2016
@@ -123,8 +123,8 @@ get_urls(void *baton,
 {
   mergeinfo_t *mi = baton;
   apr_pool_t *target_pool = apr_hash_pool_get(mi->mergeinfo);
-  const char *rel_path = svn_dirent_skip_ancestor(info->repos_root_URL,
-                                                  info->URL);
+  const char *rel_path = svn_uri_skip_ancestor(info->repos_root_URL,
+                                               info->URL, pool);
  
   mi->url = apr_pstrdup(target_pool, info->URL);
   mi->fs_path = svn_fspath__canonicalize(rel_path, target_pool);