svn commit: r1397425 - /subversion/trunk/subversion/libsvn_wc/conflicts.c

[hw...@apache.org]

Author: hwright
Date: Fri Oct 12 03:43:57 2012
New Revision: 1397425

URL: http://svn.apache.org/viewvc?rev=1397425&view=rev
Log:
Fix a bug leaving part of a struct uninitialized, and another part overwritten
with invalid data.

* subversion/libsvn_wc/conflicts.c
  (read_prop_conflicts): Set the correct field with the conflict 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=1397425&r1=1397424&r2=1397425&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_wc/conflicts.c Fri Oct 12 03:43:57 2012
@@ -2000,9 +2000,9 @@ read_prop_conflicts(apr_array_header_t *
       if (my_value == NULL)
         desc->reason = svn_wc_conflict_reason_deleted;
       else if (their_value == NULL)
-        desc->action = svn_wc_conflict_reason_added;
+        desc->reason = svn_wc_conflict_reason_added;
       else
-        desc->action = svn_wc_conflict_reason_edited;
+        desc->reason = svn_wc_conflict_reason_edited;
 
       /* ### This should be changed. The prej file should be stored
        * ### separately from the other files. We need to rev the