You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2013/06/18 11:49:14 UTC
svn commit: r1494089 - /subversion/trunk/subversion/svn/file-merge.c
Author: stsp
Date: Tue Jun 18 09:49:14 2013
New Revision: 1494089
URL: http://svn.apache.org/r1494089
Log:
Follow-up to r1491816:
* subversion/svn/file-merge.c
(merge_chunks): Don't modify input arguments when concatenating chunks.
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=1494089&r1=1494088&r2=1494089&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/file-merge.c (original)
+++ subversion/trunk/subversion/svn/file-merge.c Tue Jun 18 09:49:14 2013
@@ -683,13 +683,19 @@ merge_chunks(apr_array_header_t **merged
}
if (strcmp(answer, "12") == 0)
{
- *merged_chunk = chunk1;
+ *merged_chunk = apr_array_make(result_pool,
+ chunk1->nelts + chunk2->nelts,
+ sizeof(svn_stringbuf_t *));
+ apr_array_cat(*merged_chunk, chunk1);
apr_array_cat(*merged_chunk, chunk2);
break;
}
if (strcmp(answer, "21") == 0)
{
- *merged_chunk = chunk2;
+ *merged_chunk = apr_array_make(result_pool,
+ chunk1->nelts + chunk2->nelts,
+ sizeof(svn_stringbuf_t *));
+ apr_array_cat(*merged_chunk, chunk2);
apr_array_cat(*merged_chunk, chunk1);
break;
}