svn commit: r1727370 - /subversion/trunk/subversion/libsvn_client/resolved.c

[st...@apache.org]

Author: stsp
Date: Thu Jan 28 14:53:39 2016
New Revision: 1727370

URL: http://svn.apache.org/viewvc?rev=1727370&view=rev
Log:
* subversion/libsvn_client/resolved.c
  (svn_client_conflict_tree_get_resolution_options): Fix the default
   resolution option for tree conflicts so we don't run into the infamous
   "tree conflicts may only be resolved to working" error when the default
   option ("resolve") is used.

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=1727370&r1=1727369&r2=1727370&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/resolved.c (original)
+++ subversion/trunk/subversion/libsvn_client/resolved.c Thu Jan 28 14:53:39 2016
@@ -1028,7 +1028,7 @@ svn_client_conflict_tree_get_resolution_
 
   /* Add an option which marks the conflict resolved. */
   option = apr_pcalloc(result_pool, sizeof(*option));
-  option->id = svn_client_conflict_option_working_text;
+  option->id = svn_client_conflict_option_merged_text;
   option->description = _("accept current working copy state");
   /* Override ID and DESCRIPTION in case we can offer automated resolution: */
   if (svn_client_conflict_get_operation(conflict) == svn_wc_operation_update ||