You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2016/01/28 18:12:21 UTC
svn commit: r1727408 - /subversion/trunk/subversion/svn/conflict-callbacks.c
Author: stsp
Date: Thu Jan 28 17:12:21 2016
New Revision: 1727408
URL: http://svn.apache.org/viewvc?rev=1727408&view=rev
Log:
* subversion/svn/conflict-callbacks.c
(svn_cl__resolve_conflict): Fix type of props_conflicted pointer variable.
Found by: svn-windows-local buildbot
Modified:
subversion/trunk/subversion/svn/conflict-callbacks.c
Modified: subversion/trunk/subversion/svn/conflict-callbacks.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/conflict-callbacks.c?rev=1727408&r1=1727407&r2=1727408&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/conflict-callbacks.c (original)
+++ subversion/trunk/subversion/svn/conflict-callbacks.c Thu Jan 28 17:12:21 2016
@@ -1634,7 +1634,7 @@ svn_cl__resolve_conflict(svn_boolean_t *
apr_pool_t *scratch_pool)
{
svn_boolean_t text_conflicted;
- apr_array_header_t **props_conflicted;
+ apr_array_header_t *props_conflicted;
svn_boolean_t tree_conflicted;
SVN_ERR(svn_client_conflict_get_conflicted(&text_conflicted,