You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by hw...@apache.org on 2010/11/09 21:59:04 UTC
svn commit: r1033224 - in /subversion/branches/1.6.x: ./ CHANGES STATUS
subversion/svn/export-cmd.c subversion/tests/cmdline/merge_tests.py
Author: hwright
Date: Tue Nov 9 20:59:04 2010
New Revision: 1033224
URL: http://svn.apache.org/viewvc?rev=1033224&view=rev
Log:
Reintegrate the 1.6.x-issue3745 branch:
* r1032259
Fix issue #3745, "svn export mistakenly uri-encodes paths"
Justification:
Without this fix, users cannot export paths from working copies
if the paths contain special characters such as spaces.
Branch:
^/subversion/branches/1.6.x-issue3745
Votes:
+1: stsp, cmpilato, hwright
Modified:
subversion/branches/1.6.x/ (props changed)
subversion/branches/1.6.x/CHANGES (props changed)
subversion/branches/1.6.x/STATUS
subversion/branches/1.6.x/subversion/svn/export-cmd.c
subversion/branches/1.6.x/subversion/tests/cmdline/merge_tests.py (props changed)
Propchange: subversion/branches/1.6.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 9 20:59:04 2010
@@ -24,6 +24,7 @@
/subversion/branches/1.6.x-issue3683:965785-988062
/subversion/branches/1.6.x-issue3700:991967-997279
/subversion/branches/1.6.x-issue3727:1032967-1033213
+/subversion/branches/1.6.x-issue3745:1032257-1033223
/subversion/branches/1.6.x-no-svn_uri:876360-876415
/subversion/branches/1.6.x-r1002094:1002741-1002773
/subversion/branches/1.6.x-r36178:877876-877884
Propchange: subversion/branches/1.6.x/CHANGES
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 9 20:59:04 2010
@@ -24,6 +24,7 @@
/subversion/branches/1.6.x-issue3683/CHANGES:965785-988062
/subversion/branches/1.6.x-issue3700/CHANGES:991967-997279
/subversion/branches/1.6.x-issue3727/CHANGES:1032967-1033213
+/subversion/branches/1.6.x-issue3745/CHANGES:1032257-1033223
/subversion/branches/1.6.x-no-svn_uri/CHANGES:876360-876415
/subversion/branches/1.6.x-r1002094/CHANGES:1002741-1002773
/subversion/branches/1.6.x-r36178/CHANGES:877876-877884
Modified: subversion/branches/1.6.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x/STATUS?rev=1033224&r1=1033223&r2=1033224&view=diff
==============================================================================
--- subversion/branches/1.6.x/STATUS (original)
+++ subversion/branches/1.6.x/STATUS Tue Nov 9 20:59:04 2010
@@ -287,16 +287,6 @@ Approved changes:
Votes:
+1: danielsh, cmpilato, stsp
- * r1032259
- Fix issue #3745, "svn export mistakenly uri-encodes paths"
- Justification:
- Without this fix, users cannot export paths from working copies
- if the paths contain special characters such as spaces.
- Branch:
- ^/subversion/branches/1.6.x-issue3745
- Votes:
- +1: stsp, cmpilato, hwright
-
* r1032808
Fix blame -g server-side memory leaks.
Justification:
Modified: subversion/branches/1.6.x/subversion/svn/export-cmd.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x/subversion/svn/export-cmd.c?rev=1033224&r1=1033223&r2=1033224&view=diff
==============================================================================
--- subversion/branches/1.6.x/subversion/svn/export-cmd.c (original)
+++ subversion/branches/1.6.x/subversion/svn/export-cmd.c Tue Nov 9 20:59:04 2010
@@ -80,7 +80,8 @@ svn_cl__export(apr_getopt_t *os,
opt_state->depth = svn_depth_infinity;
/* Decode the partially encoded URL and escape all URL unsafe characters. */
- truefrom = svn_path_uri_encode(svn_path_uri_decode(truefrom, pool), pool);
+ if (svn_path_is_url(truefrom))
+ truefrom = svn_path_uri_encode(svn_path_uri_decode(truefrom, pool), pool);
/* Do the export. */
err = svn_client_export4(NULL, truefrom, to, &peg_revision,
Propchange: subversion/branches/1.6.x/subversion/tests/cmdline/merge_tests.py
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 9 20:59:04 2010
@@ -24,6 +24,7 @@
/subversion/branches/1.6.x-issue3683/subversion/tests/cmdline/merge_tests.py:965785-988062
/subversion/branches/1.6.x-issue3700/subversion/tests/cmdline/merge_tests.py:991967-997279
/subversion/branches/1.6.x-issue3727/subversion/tests/cmdline/merge_tests.py:1032967-1033213
+/subversion/branches/1.6.x-issue3745/subversion/tests/cmdline/merge_tests.py:1032257-1033223
/subversion/branches/1.6.x-no-svn_uri/subversion/tests/cmdline/merge_tests.py:876360-876415
/subversion/branches/1.6.x-r1002094/subversion/tests/cmdline/merge_tests.py:1002741-1002773
/subversion/branches/1.6.x-r36178/subversion/tests/cmdline/merge_tests.py:877876-877884