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

[st...@apache.org]

Author: stsp
Date: Fri Feb 19 15:23:22 2016
New Revision: 1731255

URL: http://svn.apache.org/viewvc?rev=1731255&view=rev
Log:
* subversion/libsvn_client/resolved.c
  (resolve_tree_conflict): Error out if no resolution strategy matched and
   the chosen resolution is something other than accepting the current
   working copy state.

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=1731255&r1=1731254&r2=1731255&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/resolved.c (original)
+++ subversion/trunk/subversion/libsvn_client/resolved.c Fri Feb 19 15:23:22 2016
@@ -874,6 +874,14 @@ resolve_tree_conflict(svn_client_conflic
                                                           ctx->notify_baton2,
                                                           scratch_pool);
     }
+  else if (option_id != svn_client_conflict_option_merged_text)
+    {
+      err = svn_error_createf(SVN_ERR_WC_CONFLICT_RESOLVER_FAILURE, NULL,
+                              _("Tree conflict on '%s' can only be resolved "
+                                "to the current working copy state"),
+                              svn_dirent_local_style(local_abspath,
+                                                     scratch_pool));
+    }
   else
     {
       svn_wc_conflict_choice_t conflict_choice;