subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1618669 - /subversion/trunk/subversion/libsvn_wc/info.c
Date Mon, 18 Aug 2014 17:27:09 GMT
Author: stsp
Date: Mon Aug 18 17:27:09 2014
New Revision: 1618669

URL: http://svn.apache.org/r1618669
Log:
* subversion/libsvn_wc/info.c
  (svn_wc__get_info): Populate wc_info->conflicts2.

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

Modified: subversion/trunk/subversion/libsvn_wc/info.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/info.c?rev=1618669&r1=1618668&r2=1618669&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/info.c (original)
+++ subversion/trunk/subversion/libsvn_wc/info.c Mon Aug 18 17:27:09 2014
@@ -600,6 +600,7 @@ svn_wc__get_info(svn_wc_context_t *wc_ct
 
       info->wc_info->conflicts = svn_wc__cd3_array_to_cd2_array(conflicts,
                                                                 iterpool);
+      info->wc_info->conflicts2 = conflicts;
       SVN_ERR(receiver(receiver_baton, this_abspath, info, iterpool));
     }
   svn_pool_destroy(iterpool);



Mime
View raw message