svn commit: r1618911 - /subversion/trunk/subversion/libsvn_wc/deprecated.c

[stsp]

Author: stsp
Date: Tue Aug 19 17:37:26 2014
New Revision: 1618911

URL: http://svn.apache.org/r1618911
Log:
Follow up to r1618906: Fix assignment to wrong pointer type.

* subversion/libsvn_wc/deprecated.c
  (svn_wc__status2_from_3): Convert from svn_wc_conflict_description2_t
   instead of copying to a pointer of type svn_wc_conflict_description_t.

Modified:
    subversion/trunk/subversion/libsvn_wc/deprecated.c

Modified: subversion/trunk/subversion/libsvn_wc/deprecated.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/deprecated.c?rev=1618911&r1=1618910&r2=1618911&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/deprecated.c (original)
+++ subversion/trunk/subversion/libsvn_wc/deprecated.c Tue Aug 19 17:37:26 2014
@@ -2735,8 +2735,10 @@ svn_wc__status2_from_3(svn_wc_status2_t 
 
   if (old_status->conflicted)
     {
-      SVN_ERR(svn_wc__get_tree_conflict(&(*status)->tree_conflict, wc_ctx, 
local_abspath,
+      const svn_wc_conflict_description2_t *tree_conflict2;
+      SVN_ERR(svn_wc__get_tree_conflict(&tree_conflict2, wc_ctx, local_abspath,
                                         scratch_pool, scratch_pool));
+      (*status)->tree_conflict = svn_wc__cd2_to_cd(tree_conflict2, 
result_pool);
     }
 
   (*status)->switched = old_status->switched;