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 2016/02/23 13:19:22 UTC
svn commit: r1731846 - /subversion/trunk/subversion/libsvn_client/conflicts.c
Author: stsp
Date: Tue Feb 23 12:19:22 2016
New Revision: 1731846
URL: http://svn.apache.org/viewvc?rev=1731846&view=rev
Log:
* subversion/libsvn_client/conflicts.c
(conflict_option_id_to_wc_conflict_choice): Stop mapping tree conflict
options to legacy wc conflict options. This is not needed anymore.
Modified:
subversion/trunk/subversion/libsvn_client/conflicts.c
Modified: subversion/trunk/subversion/libsvn_client/conflicts.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/conflicts.c?rev=1731846&r1=1731845&r2=1731846&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_client/conflicts.c Tue Feb 23 12:19:22 2016
@@ -142,12 +142,6 @@ conflict_option_id_to_wc_conflict_choice
case svn_client_conflict_option_unspecified:
return svn_wc_conflict_choose_unspecified;
- /* ### These options are mapped to conflict_choice_t for now
- * ### because libsvn_wc does not offer an interface for them. */
- case svn_client_conflict_option_update_move_destination:
- case svn_client_conflict_option_update_any_moved_away_children:
- return svn_wc_conflict_choose_mine_conflict;
-
default:
break;
}