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 2015/09/18 18:04:20 UTC

svn commit: r1703895 - /subversion/trunk/subversion/svn/conflict-callbacks.c

Author: stsp
Date: Fri Sep 18 16:04:20 2015
New Revision: 1703895

URL: http://svn.apache.org/viewvc?rev=1703895&view=rev
Log:
* subversion/svn/conflict-callbacks.c
  (svn_cl__conflict_func_interactive): Fix a type mismatch in comparison.

Found by: danielsh

Modified:
    subversion/trunk/subversion/svn/conflict-callbacks.c

Modified: subversion/trunk/subversion/svn/conflict-callbacks.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/conflict-callbacks.c?rev=1703895&r1=1703894&r2=1703895&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/conflict-callbacks.c (original)
+++ subversion/trunk/subversion/svn/conflict-callbacks.c Fri Sep 18 16:04:20 2015
@@ -1527,7 +1527,7 @@ svn_cl__conflict_func_interactive(svn_wc
   (*result)->merged_value = merged_propval;
 
   /* If we are resolving a conflict, adjust the summary of conflicts. */
-  if ((*result)->choice != svn_client_conflict_option_postpone)
+  if (option_id != svn_client_conflict_option_postpone)
     {
       const char *local_path
         = svn_cl__local_style_skip_ancestor(