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/25 18:17:43 UTC
svn commit: r1496529 - /subversion/trunk/subversion/libsvn_wc/conflicts.c
Author: stsp
Date: Tue Jun 25 16:17:43 2013
New Revision: 1496529
URL: http://svn.apache.org/r1496529
Log:
* subversion/libsvn_wc/conflicts.c
(generate_prop_conflict): Remove unneeded empty lines, fix space-before-paren.
No functional change.
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=1496529&r1=1496528&r2=1496529&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_wc/conflicts.c Tue Jun 25 16:17:43 2013
@@ -1332,7 +1332,6 @@ generate_propconflict(svn_boolean_t *con
base_file stay NULL as-is. Both agents are attempting to add a
new property. */
}
-
else if ((base_val && !incoming_old_val)
|| (!base_val && incoming_old_val))
{
@@ -1354,7 +1353,6 @@ generate_propconflict(svn_boolean_t *con
scratch_pool));
cdesc->base_abspath = svn_dirent_join(dirpath, file_name, scratch_pool);
}
-
else /* base and old are both non-NULL */
{
const svn_string_t *conflict_base_val;
@@ -1404,8 +1402,8 @@ generate_propconflict(svn_boolean_t *con
SVN_ERR(svn_diff_mem_string_diff3(&diff, conflict_base_val,
working_val,
incoming_new_val, options, scratch_pool));
- SVN_ERR(svn_diff_mem_string_output_merge2
- (mergestream, diff, conflict_base_val, working_val,
+ SVN_ERR(svn_diff_mem_string_output_merge2(mergestream, diff,
+ conflict_base_val, working_val,
incoming_new_val, NULL, NULL, NULL, NULL,
svn_diff_conflict_display_modified_latest, scratch_pool));
SVN_ERR(svn_stream_close(mergestream));