subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1730944 - /subversion/trunk/subversion/libsvn_wc/conflicts.c
Date Wed, 17 Feb 2016 21:05:15 GMT
Author: stsp
Date: Wed Feb 17 21:05:14 2016
New Revision: 1730944

URL: http://svn.apache.org/viewvc?rev=1730944&view=rev
Log:
* subversion/libsvn_wc/conflicts.c
  (svn_wc__conflict_tree_update_raise_moved_away): Ensure that conflict action
   has the expected value.

Modified:
    subversion/trunk/subversion/libsvn_wc/conflicts.c

Modified: subversion/trunk/subversion/libsvn_wc/conflicts.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/conflicts.c?rev=1730944&r1=1730943&r2=1730944&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_wc/conflicts.c Wed Feb 17 21:05:14 2016
@@ -3524,6 +3524,12 @@ svn_wc__conflict_tree_update_raise_moved
                              svn_token__to_word(reason_map, reason),
                              svn_dirent_local_style(local_abspath,
                                                      scratch_pool));
+  if (action != svn_wc_conflict_action_edit)
+    return svn_error_createf(SVN_ERR_WC_CONFLICT_RESOLVER_FAILURE, NULL,
+                             _("Unexpected conflict action '%s' on '%s'"),
+                             svn_token__to_word(action_map, action),
+                             svn_dirent_local_style(local_abspath,
+                                                    scratch_pool));
 
   /* Raise local moved-away vs. incoming edit conflicts on any children
    * moved out of this directory, and leave this directory as-is.



Mime
View raw message