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/02/25 17:29:55 UTC
svn commit: r1449768 - /subversion/trunk/subversion/svn/conflict-callbacks.c
Author: stsp
Date: Mon Feb 25 16:29:55 2013
New Revision: 1449768
URL: http://svn.apache.org/r1449768
Log:
Follow-up to r1449764: Fix a crash due to an uninitialised variable.
* subversion/svn/conflict-callbacks.c
(handle_tree_conflict): Use the default tree conflict menu with update/switch
if none of the special-case menus applies.
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=1449768&r1=1449767&r2=1449768&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/conflict-callbacks.c (original)
+++ subversion/trunk/subversion/svn/conflict-callbacks.c Mon Feb 25 16:29:55 2013
@@ -876,6 +876,8 @@ handle_tree_conflict(svn_wc_conflict_res
tc_opts = tree_conflict_options_update_moved_away;
else if (desc->reason == svn_wc_conflict_reason_deleted)
tc_opts = tree_conflict_options_update_deleted;
+ else
+ tc_opts = tree_conflict_options;
}
else
tc_opts = tree_conflict_options;