You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by sv...@apache.org on 2013/05/29 06:00:15 UTC
svn commit: r1487226 - in /subversion/branches/1.8.x: ./ STATUS
subversion/libsvn_diff/parse-diff.c
Author: svn-role
Date: Wed May 29 04:00:13 2013
New Revision: 1487226
URL: http://svn.apache.org/r1487226
Log:
Merge r1486915 from trunk:
* r1486915
Provide APR_BUFFERED flag when opening file in svn patch.
Justification:
One-line fix to dramatically improve svn patch performance. Without
this fix applying 27 KB patch takes minutes.
Votes:
+1: ivan, stsp, danielsh, philip
Modified:
subversion/branches/1.8.x/ (props changed)
subversion/branches/1.8.x/STATUS
subversion/branches/1.8.x/subversion/libsvn_diff/parse-diff.c
Propchange: subversion/branches/1.8.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1486915
Modified: subversion/branches/1.8.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1487226&r1=1487225&r2=1487226&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Wed May 29 04:00:13 2013
@@ -102,14 +102,6 @@ Approved changes:
# blocking issues. If in doubt see this link for details:
# http://subversion.apache.org/docs/community-guide/releasing.html#release-stabilization
- * r1486915
- Provide APR_BUFFERED flag when opening file in svn patch.
- Justification:
- One-line fix to dramatically improve svn patch performance. Without
- this fix applying 27 KB patch takes minutes.
- Votes:
- +1: ivan, stsp, danielsh, philip
-
* r1486809
svnpubsub: fix MIME type of response.
Justification:
Modified: subversion/branches/1.8.x/subversion/libsvn_diff/parse-diff.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/libsvn_diff/parse-diff.c?rev=1487226&r1=1487225&r2=1487226&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/libsvn_diff/parse-diff.c (original)
+++ subversion/branches/1.8.x/subversion/libsvn_diff/parse-diff.c Wed May 29 04:00:13 2013
@@ -1146,8 +1146,9 @@ svn_diff_open_patch_file(svn_patch_file_
svn_patch_file_t *p;
p = apr_palloc(result_pool, sizeof(*p));
- SVN_ERR(svn_io_file_open(&p->apr_file, local_abspath, APR_READ,
- APR_OS_DEFAULT, result_pool));
+ SVN_ERR(svn_io_file_open(&p->apr_file, local_abspath,
+ APR_READ | APR_BUFFERED, APR_OS_DEFAULT,
+ result_pool));
p->next_patch_offset = 0;
*patch_file = p;