svn commit: r1740335 - /subversion/trunk/subversion/libsvn_client/conflicts.c

[st...@apache.org]

Author: stsp
Date: Thu Apr 21 14:54:58 2016
New Revision: 1740335

URL: http://svn.apache.org/viewvc?rev=1740335&view=rev
Log:
* subversion/libsvn_client/conflicts.c
  (resolve_prop_conflict): Don't try to get the next element from an empty set.
   Should fix spurious failures of resolve_tests.py 2 on the buildbots.

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

Modified: subversion/trunk/subversion/libsvn_client/conflicts.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/conflicts.c?rev=1740335&r1=1740334&r2=1740335&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_client/conflicts.c Thu Apr 21 14:54:58 2016
@@ -3438,9 +3438,12 @@ resolve_prop_conflict(svn_client_conflic
                    option);
       svn_hash_sets(conflict->prop_conflicts, propname, NULL);
 
-      conflict->legacy_prop_conflict_propname =
-          apr_hash_this_key(apr_hash_first(scratch_pool,
-                                           conflict->prop_conflicts));
+      if (apr_hash_count(conflict->prop_conflicts) > 0)
+        conflict->legacy_prop_conflict_propname =
+            apr_hash_this_key(apr_hash_first(scratch_pool,
+                                             conflict->prop_conflicts));
+      else
+        conflict->legacy_prop_conflict_propname = NULL;
     }
 
   return SVN_NO_ERROR;