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

[st...@apache.org]

Author: stsp
Date: Wed Sep 16 12:33:49 2015
New Revision: 1703391

URL: http://svn.apache.org/r1703391
Log:
* subversion/libsvn_client/resolved.c
  (conflict_get_internal): Always add a legacy conflict for now so
   all callers can assume it will be present and use it.

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=1703391&r1=1703390&r2=1703391&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/resolved.c (original)
+++ subversion/trunk/subversion/libsvn_client/resolved.c Wed Sep 16 12:33:49 2015
@@ -319,8 +319,7 @@ conflict_get_internal(svn_client_conflic
             (*conflict)->prop_conflicts = apr_hash_make(result_pool);
           svn_hash_sets((*conflict)->prop_conflicts, desc->property_name, desc);
         }
-      else
-        add_legacy_desc_to_conflict(desc, *conflict, result_pool);
+      add_legacy_desc_to_conflict(desc, *conflict, result_pool);
     }
 
   return SVN_NO_ERROR;