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 2014/01/29 05:04:38 UTC
svn commit: r1562350 - in /subversion/branches/1.8.x: ./ STATUS
subversion/libsvn_subr/io.c
Author: svn-role
Date: Wed Jan 29 04:04:38 2014
New Revision: 1562350
URL: http://svn.apache.org/r1562350
Log:
Merge r1548486 from trunk:
* r1548486
When (during merge) we compare three files to each other stop reading
specific files when we find enough differences.
Justification:
Trivial fix that can have a huge performance impact for some users.
Votes:
+1: rhuijben, stefan2, philip
Modified:
subversion/branches/1.8.x/ (props changed)
subversion/branches/1.8.x/STATUS
subversion/branches/1.8.x/subversion/libsvn_subr/io.c
Propchange: subversion/branches/1.8.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1548486
Modified: subversion/branches/1.8.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1562350&r1=1562349&r2=1562350&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Wed Jan 29 04:04:38 2014
@@ -256,14 +256,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r1548486
- When (during merge) we compare three files to each other stop reading
- specific files when we find enough differences.
- Justification:
- Trivial fix that can have a huge performance impact for some users.
- Votes:
- +1: rhuijben, stefan2, philip
-
* r1557522
Make mod_dav_svn report all property changes in 'include-properties' mode,
even in uncommon configurations.
Modified: subversion/branches/1.8.x/subversion/libsvn_subr/io.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/libsvn_subr/io.c?rev=1562350&r1=1562349&r2=1562350&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/libsvn_subr/io.c (original)
+++ subversion/branches/1.8.x/subversion/libsvn_subr/io.c Wed Jan 29 04:04:38 2014
@@ -4284,7 +4284,7 @@ contents_three_identical_p(svn_boolean_t
/* As long as a file is not at the end yet, and it is still
* potentially identical to another file, we read the next chunk.*/
- if (!eof1 && (identical_p12 || identical_p13))
+ if (!eof1 && (*identical_p12 || *identical_p13))
{
err = svn_io_file_read_full2(file1_h, buf1,
SVN__STREAM_CHUNK_SIZE, &bytes_read1,
@@ -4294,7 +4294,7 @@ contents_three_identical_p(svn_boolean_t
read_1 = TRUE;
}
- if (!eof2 && (identical_p12 || identical_p23))
+ if (!eof2 && (*identical_p12 || *identical_p23))
{
err = svn_io_file_read_full2(file2_h, buf2,
SVN__STREAM_CHUNK_SIZE, &bytes_read2,
@@ -4304,7 +4304,7 @@ contents_three_identical_p(svn_boolean_t
read_2 = TRUE;
}
- if (!eof3 && (identical_p13 || identical_p23))
+ if (!eof3 && (*identical_p13 || *identical_p23))
{
err = svn_io_file_read_full2(file3_h, buf3,
SVN__STREAM_CHUNK_SIZE, &bytes_read3,