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 17:54:38 UTC

svn commit: r1727405 - /subversion/trunk/subversion/libsvn_client/resolved.c

Author: stsp
Date: Thu Jan 28 16:54:38 2016
New Revision: 1727405

URL: http://svn.apache.org/viewvc?rev=1727405&view=rev
Log:
* subversion/libsvn_client/resolved.c
  (svn_client_conflict_get_conflicted): Satisfy docstring's requirement and
   return an empty array if there are no conflict properties.

Modified:
    subversion/trunk/subversion/libsvn_client/resolved.c

Modified: subversion/trunk/subversion/libsvn_client/resolved.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/resolved.c?rev=1727405&r1=1727404&r2=1727405&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/resolved.c (original)
+++ subversion/trunk/subversion/libsvn_client/resolved.c Thu Jan 28 16:54:38 2016
@@ -1289,7 +1289,8 @@ svn_client_conflict_get_conflicted(svn_b
         SVN_ERR(svn_hash_keys(props_conflicted, conflict->prop_conflicts,
                               result_pool));
       else
-        *props_conflicted = NULL;
+        *props_conflicted = apr_array_make(result_pool, 0,
+                                           sizeof(const char*));
     }
 
   if (tree_conflicted)