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 2016/01/15 17:48:28 UTC
svn commit: r1724855 - /subversion/trunk/subversion/libsvn_wc/conflicts.c
Author: stsp
Date: Fri Jan 15 16:48:27 2016
New Revision: 1724855
URL: http://svn.apache.org/viewvc?rev=1724855&view=rev
Log:
* subversion/libsvn_wc/conflicts.c
(svn_wc_create_conflict_result): Initialise 'merged_value' (new in 1.9).
Modified:
subversion/trunk/subversion/libsvn_wc/conflicts.c
Modified: subversion/trunk/subversion/libsvn_wc/conflicts.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/conflicts.c?rev=1724855&r1=1724854&r2=1724855&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_wc/conflicts.c Fri Jan 15 16:48:27 2016
@@ -3303,6 +3303,7 @@ svn_wc_create_conflict_result(svn_wc_con
result->choice = choice;
result->merged_file = apr_pstrdup(pool, merged_file);
result->save_merged = FALSE;
+ result->merged_value = NULL;
/* If we add more fields to svn_wc_conflict_result_t, add them here. */
Re: svn commit: r1724855 -
/subversion/trunk/subversion/libsvn_wc/conflicts.c
Posted by Stefan Sperling <st...@apache.org>.
On Fri, Jan 15, 2016 at 04:48:28PM -0000, stsp@apache.org wrote:
> Author: stsp
> Date: Fri Jan 15 16:48:27 2016
> New Revision: 1724855
>
> URL: http://svn.apache.org/viewvc?rev=1724855&view=rev
> Log:
> * subversion/libsvn_wc/conflicts.c
> (svn_wc_create_conflict_result): Initialise 'merged_value' (new in 1.9).
>
> Modified:
> subversion/trunk/subversion/libsvn_wc/conflicts.c
>
> Modified: subversion/trunk/subversion/libsvn_wc/conflicts.c
> URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/conflicts.c?rev=1724855&r1=1724854&r2=1724855&view=diff
> ==============================================================================
> --- subversion/trunk/subversion/libsvn_wc/conflicts.c (original)
> +++ subversion/trunk/subversion/libsvn_wc/conflicts.c Fri Jan 15 16:48:27 2016
> @@ -3303,6 +3303,7 @@ svn_wc_create_conflict_result(svn_wc_con
> result->choice = choice;
> result->merged_file = apr_pstrdup(pool, merged_file);
> result->save_merged = FALSE;
> + result->merged_value = NULL;
>
> /* If we add more fields to svn_wc_conflict_result_t, add them here. */
This may look like a bug fix at first sight but is not worth backporting.
Note that 'result' is allocated with apr_pcalloc() which should implicitly
initialize 'merged_value' to zero/NULL.
I just added this field for completeness.