svn commit: r1833866 - /subversion/trunk/subversion/libsvn_client/conflicts.c

[st...@apache.org]

Author: stsp
Date: Tue Jun 19 18:08:34 2018
New Revision: 1833866

URL: http://svn.apache.org/viewvc?rev=1833866&view=rev
Log:
Follow-up to r1833864:

* subversion/libsvn_client/conflicts.c
  (verify_local_state_for_incoming_delete): Compare local_change to the
   correct type of enum. No functional change because the enum values
   svn_wc_conflict_action_edit and svn_wc_conflict_reason_edited happen
   to match.

Found by: svn-warnings buildbot

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=1833866&r1=1833865&r2=1833866&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_client/conflicts.c Tue Jun 19 18:08:34 2018
@@ -8169,7 +8169,7 @@ verify_local_state_for_incoming_delete(s
                                      conflict->local_abspath),
                                    scratch_pool));
 
-      if (local_change == svn_wc_conflict_action_edit)
+      if (local_change == svn_wc_conflict_reason_edited)
         SVN_ERR(ensure_local_edit_vs_incoming_deletion_copied_state(
                   details, operation, wcroot_abspath, conflict, ctx,
                   scratch_pool));