You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by iv...@apache.org on 2015/10/08 18:53:59 UTC
svn commit: r1707584 - /subversion/trunk/subversion/libsvn_wc/conflicts.c
Author: ivan
Date: Thu Oct 8 16:53:59 2015
New Revision: 1707584
URL: http://svn.apache.org/viewvc?rev=1707584&view=rev
Log:
* subversion/libsvn_wc/conflicts.c
(generate_propconflict): Reduce scope of local variable.
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=1707584&r1=1707583&r2=1707584&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_wc/conflicts.c Thu Oct 8 16:53:59 2015
@@ -1351,8 +1351,6 @@ generate_propconflict(svn_boolean_t *con
}
case svn_wc_conflict_choose_merged:
{
- svn_stringbuf_t *merged_stringbuf;
-
if (!cdesc->merged_file
&& (!result->merged_file && !result->merged_value))
return svn_error_create
@@ -1364,6 +1362,8 @@ generate_propconflict(svn_boolean_t *con
new_value = result->merged_value;
else
{
+ svn_stringbuf_t *merged_stringbuf;
+
SVN_ERR(svn_stringbuf_from_file2(&merged_stringbuf,
result->merged_file ?
result->merged_file :