Author: stsp
Date: Wed Feb 17 21:03:44 2016
New Revision: 1730943
URL: http://svn.apache.org/viewvc?rev=1730943&view=rev
Log:
* subversion/libsvn_client/resolved.c
(resolve_tree_conflict): Initialize 'incoming_change' variable.
Modified:
subversion/trunk/subversion/libsvn_client/resolved.c
Modified: subversion/trunk/subversion/libsvn_client/resolved.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/resolved.c?rev=1730943&r1=1730942&r2=1730943&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/resolved.c (original)
+++ subversion/trunk/subversion/libsvn_client/resolved.c Wed Feb 17 21:03:44
2016
@@ -806,6 +806,7 @@ resolve_tree_conflict(svn_client_conflic
local_abspath = svn_client_conflict_get_local_abspath(conflict);
operation = svn_client_conflict_get_operation(conflict);
local_change = svn_client_conflict_get_local_change(conflict);
+ incoming_change = svn_client_conflict_get_incoming_change(conflict);
SVN_ERR(svn_wc__acquire_write_lock_for_resolve(&lock_abspath, ctx->wc_ctx,
local_abspath,
