Author: svn-role
Date: Wed Jun 13 12:58:56 2012
New Revision: 1349814
URL: http://svn.apache.org/viewvc?rev=1349814&view=rev
Log:
Merge r1345482 from trunk:
* r1345482
Resolve a theoretical assertion when upgrading, in case the working copy
contains tree conflicts with a url that is not canonical in 1.7+.
Justification:
Upgrading should be painless.
Votes:
+1: rhuijben, gstein, steveking
Modified:
subversion/branches/1.7.x/ (props changed)
subversion/branches/1.7.x/STATUS
subversion/branches/1.7.x/subversion/libsvn_wc/tree_conflicts.c
Propchange: subversion/branches/1.7.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1345482
Modified: subversion/branches/1.7.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1349814&r1=1349813&r2=1349814&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Wed Jun 13 12:58:56 2012
@@ -140,14 +140,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r1345482
- Resolve a theoretical assertion when upgrading, in case the working copy
- contains tree conflicts with a url that is not canonical in 1.7+.
- Justification:
- Upgrading should be painless.
- Votes:
- +1: rhuijben, gstein, steveking
-
* r1349367, r1349371, r1349380
Fix a bug in ra_serf that prevented it working against pre-1.2 servers.
Justification:
Modified: subversion/branches/1.7.x/subversion/libsvn_wc/tree_conflicts.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/libsvn_wc/tree_conflicts.c?rev=1349814&r1=1349813&r2=1349814&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/libsvn_wc/tree_conflicts.c (original)
+++ subversion/branches/1.7.x/subversion/libsvn_wc/tree_conflicts.c Wed Jun 13
12:58:56 2012
@@ -155,15 +155,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));
