svn commit: r1345482 - /subversion/trunk/subversion/libsvn_wc/tree_conflicts.c

[rh...@apache.org]

Author: rhuijben
Date: Sat Jun  2 10:57:16 2012
New Revision: 1345482

URL: http://svn.apache.org/viewvc?rev=1345482&view=rev
Log:
* subversion/libsvn_wc/tree_conflicts.c
  (read_node_version_info): Avoid a canonicalization assertion, by properly
    canonicalizing a url that was just canonical with the <= 1.6 rules.

Found by: steveking

Modified:
    subversion/trunk/subversion/libsvn_wc/tree_conflicts.c

Modified: subversion/trunk/subversion/libsvn_wc/tree_conflicts.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/tree_conflicts.c?rev=1345482&r1=1345481&r2=1345482&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/tree_conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_wc/tree_conflicts.c Sat Jun  2 10:57:16 2012
@@ -158,15 +158,18 @@ read_node_version_info(const svn_wc_conf
                             _("Invalid version info in tree conflict "
                               "description"));
 
-  repos_root = apr_pstrmemdup(result_pool,
-                                           skel->children->next->data,
-                                           skel->children->next->len);
+  repos_root = apr_pstrmemdup(scratch_pool,
+                              skel->children->next->data,
+                              skel->children->next->len);
   if (*repos_root == '\0')
     {
       *version_info = NULL;
       return SVN_NO_ERROR;
     }
 
+  /* Apply the Subversion 1.7+ url canonicalization rules to a pre 1.7 url */
+  repos_root = svn_uri_canonicalize(repos_root, result_pool);
+
   peg_rev = SVN_STR_TO_REV(apr_pstrmemdup(scratch_pool,
                                           skel->children->next->next->data,
                                           skel->children->next->next->len));