subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From julianf...@apache.org
Subject svn commit: r1470031 - /subversion/trunk/subversion/libsvn_wc/conflicts.c
Date Fri, 19 Apr 2013 20:43:28 GMT
Author: julianfoad
Date: Fri Apr 19 20:43:27 2013
New Revision: 1470031

URL: http://svn.apache.org/r1470031
Log:
* subversion/libsvn_wc/conflicts.c
  (read_prop_conflicts): Correctly set the conflict 'action' and 'reason'.

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=1470031&r1=1470030&r2=1470031&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_wc/conflicts.c Fri Apr 19 20:43:27 2013
@@ -2127,11 +2127,12 @@ read_prop_conflicts(apr_array_header_t *
 
       my_value = svn_hash_gets(my_props, propname);
       their_value = svn_hash_gets(their_props, propname);
+      old_value = svn_hash_gets(their_old_props, propname);
 
       /* Compute the incoming side of the conflict ('action'). */
       if (their_value == NULL)
         desc->action = svn_wc_conflict_action_delete;
-      else if (my_value == NULL)
+      else if (old_value == NULL)
         desc->action = svn_wc_conflict_action_add;
       else
         desc->action = svn_wc_conflict_action_edit;
@@ -2139,7 +2140,7 @@ read_prop_conflicts(apr_array_header_t *
       /* Compute the local side of the conflict ('reason'). */
       if (my_value == NULL)
         desc->reason = svn_wc_conflict_reason_deleted;
-      else if (their_value == NULL)
+      else if (old_value == NULL)
         desc->reason = svn_wc_conflict_reason_added;
       else
         desc->reason = svn_wc_conflict_reason_edited;
@@ -2182,7 +2183,6 @@ read_prop_conflicts(apr_array_header_t *
           SVN_ERR(svn_stream_close(s));
         }
 
-      old_value = svn_hash_gets(their_old_props, propname);
       if (old_value)
         {
           svn_stream_t *s;



Mime
View raw message