You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by br...@apache.org on 2013/10/24 23:18:38 UTC
svn commit: r1535553 - in /subversion/branches/1.7.x-issue4153: ./ STATUS
subversion/libsvn_wc/old-and-busted.c
subversion/tests/cmdline/upgrade_tests.py
Author: breser
Date: Thu Oct 24 21:18:38 2013
New Revision: 1535553
URL: http://svn.apache.org/r1535553
Log:
Do a syncup merge on the 1.7.x-issue4153 branch.
Modified:
subversion/branches/1.7.x-issue4153/ (props changed)
subversion/branches/1.7.x-issue4153/STATUS
subversion/branches/1.7.x-issue4153/subversion/libsvn_wc/old-and-busted.c
subversion/branches/1.7.x-issue4153/subversion/tests/cmdline/upgrade_tests.py
Propchange: subversion/branches/1.7.x-issue4153/
------------------------------------------------------------------------------
Merged /subversion/branches/1.7.x:r1521933-1535552
Merged /subversion/trunk:r1520529,1520532,1520539
Modified: subversion/branches/1.7.x-issue4153/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-issue4153/STATUS?rev=1535553&r1=1535552&r2=1535553&view=diff
==============================================================================
--- subversion/branches/1.7.x-issue4153/STATUS (original)
+++ subversion/branches/1.7.x-issue4153/STATUS Thu Oct 24 21:18:38 2013
@@ -18,7 +18,7 @@ Candidate changes:
* r1306275, and other revisions
New diff support code for added/deleted files and directories.
Fixes issue #4153, "svn log --diff" on moved file gives "not found",
- and other problems.
+ and other problems, such as issue #4421.
Justification:
The current code (introduced in 1.7.x in the r1207351 backport commit)
produces inconsistent paths in diff output (see
@@ -26,8 +26,6 @@ Candidate changes:
with the paradigm that the target of an editor drive may never have more
than one path component (which according to cmpilato is an API violation).
Notes:
- Conflict in diff_tests.py can be interactively resolved with:
- (m) merge -> 21 (your version first, then theirs) -> r (resolved)
Please read the branch and related trunk log messages for detailed notes
about these changes.
Branch:
@@ -114,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,
@@ -123,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
@@ -145,7 +134,53 @@ Candidate changes:
that to 1.7.x.
Votes:
+1: breser
- +0: stsp (wondering whether the r1306275 group would fix the same issue)
+ -0: stsp (see r1306275 group for a more complete fix)
+
+ * r1522892
+ Fix issue #4425 and #3014 on Windows: svn.exe crashed when output of 'log'
+ command interrupted when using ra_serf.
+ Changes[client]:
+ * fixed: command line client crashes when piped command is interrupted on
+ Windows.
+ Justification:
+ User reported crash.
+ Votes:
+ +1: rhuijben, stefan2
+
+ * r1525902
+ Fix issues #4428 and #4429: external references a redirected HTTP-URL.
+ Changes:
+ In handle_external_item_change(), a redirect was effectively ignored by
+ passing the old URL to switch_dir_external(). Pass the new one.
+ Branch:
+ ^/subversion/branches/1.7.x-issue4428
+ Votes:
+ +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.
+ Changes:
+ This was a common condition in my load tests. Affects threaded
+ servers only. Apache will just respawn a new worker process.
+ Branch:
+ ^/subversion/branches/1.7.x-r1527103
+ Votes:
+ +1: stefan2
+
+ * r1534158
+ Correct error message when FSFS detects unsupported future formats.
+ Justification:
+ The admin should see a "format number error" instead of "unknown
+ format option error" for format bumps that also add new options.
+ Votes:
+ +1: stefan2
Veto-blocked changes:
=====================
Modified: subversion/branches/1.7.x-issue4153/subversion/libsvn_wc/old-and-busted.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-issue4153/subversion/libsvn_wc/old-and-busted.c?rev=1535553&r1=1535552&r2=1535553&view=diff
==============================================================================
--- subversion/branches/1.7.x-issue4153/subversion/libsvn_wc/old-and-busted.c (original)
+++ subversion/branches/1.7.x-issue4153/subversion/libsvn_wc/old-and-busted.c Thu Oct 24 21:18:38 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-issue4153/subversion/tests/cmdline/upgrade_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-issue4153/subversion/tests/cmdline/upgrade_tests.py?rev=1535553&r1=1535552&r2=1535553&view=diff
==============================================================================
--- subversion/branches/1.7.x-issue4153/subversion/tests/cmdline/upgrade_tests.py (original)
+++ subversion/branches/1.7.x-issue4153/subversion/tests/cmdline/upgrade_tests.py Thu Oct 24 21:18:38 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