You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2013/10/14 23:06:34 UTC
svn commit: r1532095 - in /subversion/branches/1.7.x-r1527103: ./ STATUS
subversion/libsvn_wc/old-and-busted.c
subversion/tests/cmdline/upgrade_tests.py
Author: rhuijben
Date: Mon Oct 14 21:06:33 2013
New Revision: 1532095
URL: http://svn.apache.org/r1532095
Log:
On the 1.7.x-r1527103 branch: Sync with branches/1.7.x to resolve conflict
Modified:
subversion/branches/1.7.x-r1527103/ (props changed)
subversion/branches/1.7.x-r1527103/STATUS
subversion/branches/1.7.x-r1527103/subversion/libsvn_wc/old-and-busted.c
subversion/branches/1.7.x-r1527103/subversion/tests/cmdline/upgrade_tests.py
Propchange: subversion/branches/1.7.x-r1527103/
------------------------------------------------------------------------------
Merged /subversion/branches/1.7.x:r1527110-1532093
Merged /subversion/trunk:r1520529,1520532,1520539
Modified: subversion/branches/1.7.x-r1527103/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-r1527103/STATUS?rev=1532095&r1=1532094&r2=1532095&view=diff
==============================================================================
--- subversion/branches/1.7.x-r1527103/STATUS (original)
+++ subversion/branches/1.7.x-r1527103/STATUS Mon Oct 14 21:06:33 2013
@@ -112,7 +112,7 @@ Candidate changes:
commands later faile with a normal error in the RA layer, which
validates the semantics of the hostname.
Votes:
- +1: brane
+ +1: brane, stefan2
* r1518184
Fix an of-by-one error in the fspath calculations of libsvn_ra_local,
@@ -121,16 +121,7 @@ Candidate changes:
Justification:
Improves correctness. Resolves user reported problem.
Votes:
- +1: rhuijben
-
- * r1520529, r1520532, r1520539
- Properly re-canonicalize urls read from xml based entries files.
- Justification:
- The canonicalization rules have been changed since 1.3 and while
- we fixed the newer entries file parsing we forgot the xml based
- entries. Fixes a client assert.
- Votes:
- +1: rhuijben, philip
+ +1: rhuijben, stefan2
* ^/subversion/branches/1.7.x-issue4421
Fix Issue #4421
@@ -154,7 +145,7 @@ Candidate changes:
Justification:
User reported crash.
Votes:
- +1: rhuijben
+ +1: rhuijben, stefan2
* r1525902
Fix issues #4428 and #4429: external references a redirected HTTP-URL.
@@ -164,7 +155,14 @@ Candidate changes:
Branch:
^/subversion/branches/1.7.x-issue4428
Votes:
- +1: neels
+ +1: neels, stefan2
+
+ * r1524869
+ JavaHL: Canonicalize path for streamFileContent method.
+ Justification:
+ JavaHL is designed around us doing the canonicalization.
+ Votes:
+ +1: breser, stefan2
* r1527112
Fix OOM with concurrent requests right after threaded server start.
Modified: subversion/branches/1.7.x-r1527103/subversion/libsvn_wc/old-and-busted.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-r1527103/subversion/libsvn_wc/old-and-busted.c?rev=1532095&r1=1532094&r2=1532095&view=diff
==============================================================================
--- subversion/branches/1.7.x-r1527103/subversion/libsvn_wc/old-and-busted.c (original)
+++ subversion/branches/1.7.x-r1527103/subversion/libsvn_wc/old-and-busted.c Mon Oct 14 21:06:33 2013
@@ -810,11 +810,15 @@ atts_to_entry(svn_wc_entry_t **new_entry
### not used by loggy; no need to set MODIFY_FLAGS */
entry->url = extract_string(atts, ENTRIES_ATTR_URL, pool);
+ if (entry->url)
+ entry->url = svn_uri_canonicalize(entry->url, pool);
/* Set up repository root. Make sure it is a prefix of url.
### not used by loggy; no need to set MODIFY_FLAGS */
entry->repos = extract_string(atts, ENTRIES_ATTR_REPOS, pool);
+ if (entry->repos)
+ entry->repos = svn_uri_canonicalize(entry->repos, pool);
if (entry->url && entry->repos
&& !svn_uri__is_ancestor(entry->repos, entry->url))
Modified: subversion/branches/1.7.x-r1527103/subversion/tests/cmdline/upgrade_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-r1527103/subversion/tests/cmdline/upgrade_tests.py?rev=1532095&r1=1532094&r2=1532095&view=diff
==============================================================================
--- subversion/branches/1.7.x-r1527103/subversion/tests/cmdline/upgrade_tests.py (original)
+++ subversion/branches/1.7.x-r1527103/subversion/tests/cmdline/upgrade_tests.py Mon Oct 14 21:06:33 2013
@@ -426,7 +426,10 @@ def basic_upgrade_1_0(sbox):
url = sbox.repo_url
- xml_entries_relocate(sbox.wc_dir, 'file:///1.0.0/repos', url)
+ # This is non-canonical by the rules of svn_uri_canonicalize, it gets
+ # written into the entries file and upgrade has to canonicalize.
+ non_canonical_url = url[:-1] + '%%%02x' % ord(url[-1])
+ xml_entries_relocate(sbox.wc_dir, 'file:///1.0.0/repos', non_canonical_url)
# Attempt to use the working copy, this should give an error
expected_stderr = wc_is_too_old_regex