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/16 06:01:28 UTC
svn commit: r1483187 - in /subversion/branches/1.8.x: ./ STATUS
subversion/libsvn_wc/diff_editor.c
Author: svn-role
Date: Thu May 16 04:01:28 2013
New Revision: 1483187
URL: http://svn.apache.org/r1483187
Log:
Merge r1482973 from trunk:
* r1482973
Avoid using predictable temporary filenames based on "tempfile".
Justification:
Performance issue if lots of files match.
Votes:
+1: philip, rhuijben, cmpilato
Modified:
subversion/branches/1.8.x/ (props changed)
subversion/branches/1.8.x/STATUS
subversion/branches/1.8.x/subversion/libsvn_wc/diff_editor.c
Propchange: subversion/branches/1.8.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1482973
Modified: subversion/branches/1.8.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1483187&r1=1483186&r2=1483187&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Thu May 16 04:01:28 2013
@@ -134,10 +134,3 @@ Approved changes:
# that would restart the soak should not be added unless they are resolving
# blocking issues. If in doubt see this link for details:
# http://subversion.apache.org/docs/community-guide/releasing.html#release-stabilization
-
- * r1482973
- Avoid using predictable temporary filenames based on "tempfile".
- Justification:
- Performance issue if lots of files match.
- Votes:
- +1: philip, rhuijben, cmpilato
Modified: subversion/branches/1.8.x/subversion/libsvn_wc/diff_editor.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/libsvn_wc/diff_editor.c?rev=1483187&r1=1483186&r2=1483187&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/libsvn_wc/diff_editor.c (original)
+++ subversion/branches/1.8.x/subversion/libsvn_wc/diff_editor.c Thu May 16 04:01:28 2013
@@ -2362,9 +2362,9 @@ wrap_ensure_empty_file(wc_diff_wrap_bato
return SVN_NO_ERROR;
/* Create a unique file in the tempdir */
- SVN_ERR(svn_io_open_uniquely_named(NULL, &wb->empty_file, NULL, NULL, NULL,
- svn_io_file_del_on_pool_cleanup,
- wb->result_pool, scratch_pool));
+ SVN_ERR(svn_io_open_unique_file3(NULL, &wb->empty_file, NULL,
+ svn_io_file_del_on_pool_cleanup,
+ wb->result_pool, scratch_pool));
return SVN_NO_ERROR;
}