subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1739783 - /subversion/trunk/subversion/libsvn_client/conflicts.c
Date Mon, 18 Apr 2016 16:16:00 GMT
Author: stsp
Date: Mon Apr 18 16:15:59 2016
New Revision: 1739783

URL: http://svn.apache.org/viewvc?rev=1739783&view=rev
Log:
* subversion/libsvn_client/conflicts.c
  (svn_client_conflict_tree_get_resolution_options): Re-use local variable
   'option' instead of calling svn_client_conflict_get_operation() again.

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=1739783&r1=1739782&r2=1739783&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_client/conflicts.c Mon Apr 18 16:15:59 2016
@@ -3905,8 +3905,8 @@ svn_client_conflict_tree_get_resolution_
   APR_ARRAY_PUSH((*options), const svn_client_conflict_option_t *) = option;
 
   /* Add options which offer automated resolution: */
-  if (svn_client_conflict_get_operation(conflict) == svn_wc_operation_update ||
-      svn_client_conflict_get_operation(conflict) == svn_wc_operation_switch)
+  if (operation == svn_wc_operation_update ||
+      operation == svn_wc_operation_switch)
     {
       svn_wc_conflict_reason_t reason;
 



Mime
View raw message