svn commit: r1836976 - /subversion/trunk/subversion/libsvn_client/conflicts.c

[st...@apache.org]

Author: stsp
Date: Sun Jul 29 13:28:08 2018
New Revision: 1836976

URL: http://svn.apache.org/viewvc?rev=1836976&view=rev
Log:
Fix relpath_is_canonical() assertion failure in the conflict resolver.

* subversion/libsvn_client/conflicts.c
  (find_modified_rev): Make sure to canonicalize copyfrom path to a relpath,
   effectively stripping the leading slash.

Modified:
    subversion/trunk/subversion/libsvn_client/conflicts.c

Modified: subversion/trunk/subversion/libsvn_client/conflicts.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/conflicts.c?rev=1836976&r1=1836975&r2=1836976&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_client/conflicts.c Sun Jul 29 13:28:08 2018
@@ -5833,7 +5833,10 @@ find_modified_rev(void *baton,
 
           if (log_item->copyfrom_path)
             b->repos_relpath = apr_pstrdup(b->scratch_pool,
-                                           log_item->copyfrom_path);
+                                          /* ### remove leading slash */
+                                           svn_relpath_canonicalize(
+                                               log_item->copyfrom_path,
+                                               iterpool));
         }
       else if (b->node_kind == svn_node_dir &&
                svn_relpath_skip_ancestor(b->repos_relpath, path) != NULL)