Author: stsp Date: Fri Jul 6 09:29:13 2012 New Revision: 1358088 URL: http://svn.apache.org/viewvc?rev=1358088&view=rev Log: * subversion/svn/file-merge.c (read_diff_chunk): Do not drop empty lines read from the chunk.
Modified: subversion/trunk/subversion/svn/file-merge.c Modified: subversion/trunk/subversion/svn/file-merge.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/file-merge.c?rev=1358088&r1=1358087&r2=1358088&view=diff ============================================================================== --- subversion/trunk/subversion/svn/file-merge.c (original) +++ subversion/trunk/subversion/svn/file-merge.c Fri Jul 6 09:29:13 2012 @@ -351,8 +351,7 @@ read_diff_chunk(apr_array_header_t **lin result_pool, scratch_pool)); if (eol_str) svn_stringbuf_appendcstr(line, eol_str); - if (line->len > 0) - APR_ARRAY_PUSH(*lines, svn_stringbuf_t *) = line; + APR_ARRAY_PUSH(*lines, svn_stringbuf_t *) = line; if (eof) break; current_line++;