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/20 14:48:01 UTC
svn commit: r1494961 - /subversion/trunk/subversion/svn/conflict-callbacks.c
Author: stsp
Date: Thu Jun 20 12:48:01 2013
New Revision: 1494961
URL: http://svn.apache.org/r1494961
Log:
* subversion/svn/conflict-callbacks.c
(handle_tree_conflict): Initialise tc_option early, and drop all the
'else' statements which initialise it when special cases don't match.
No functional change.
Modified:
subversion/trunk/subversion/svn/conflict-callbacks.c
Modified: subversion/trunk/subversion/svn/conflict-callbacks.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/conflict-callbacks.c?rev=1494961&r1=1494960&r2=1494961&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/conflict-callbacks.c (original)
+++ subversion/trunk/subversion/svn/conflict-callbacks.c Thu Jun 20 12:48:01 2013
@@ -1055,6 +1055,8 @@ handle_tree_conflict(svn_wc_conflict_res
svn_pool_clear(iterpool);
+ tc_opts = tree_conflict_options;
+
if (desc->operation == svn_wc_operation_update ||
desc->operation == svn_wc_operation_switch)
{
@@ -1068,14 +1070,8 @@ handle_tree_conflict(svn_wc_conflict_res
if (desc->action == svn_wc_conflict_action_edit &&
desc->node_kind == svn_node_dir)
tc_opts = tree_conflict_options_update_edit_deleted_dir;
- else
- tc_opts = tree_conflict_options;
}
- else
- tc_opts = tree_conflict_options;
}
- else
- tc_opts = tree_conflict_options;
SVN_ERR(prompt_user(&opt, tc_opts, NULL, b->pb, iterpool));
if (! opt)