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/02/24 15:36:00 UTC

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

Author: stsp
Date: Wed Feb 24 14:36:00 2016
New Revision: 1732162

URL: http://svn.apache.org/viewvc?rev=1732162&view=rev
Log:
Fix two assertions.

* subversion/libsvn_client/conflicts.c
  (svn_client_conflict_prop_get_propvals,
   svn_client_conflict_text_get_contents): Fix improper use of SVN_ERR_ASSERT.

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=1732162&r1=1732161&r2=1732162&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_client/conflicts.c Wed Feb 24 14:36:00 2016
@@ -1928,7 +1928,7 @@ svn_client_conflict_prop_get_propvals(co
 {
   const svn_wc_conflict_description2_t *desc;
 
-  SVN_ERR_ASSERT(assert_prop_conflict(conflict, conflict->pool));
+  SVN_ERR(assert_prop_conflict(conflict, conflict->pool));
 
   desc = svn_hash_gets(conflict->prop_conflicts, propname);
   if (desc == NULL)
@@ -1982,7 +1982,7 @@ svn_client_conflict_text_get_contents(co
                                       apr_pool_t *result_pool,
                                       apr_pool_t *scratch_pool)
 {
-  SVN_ERR_ASSERT(assert_text_conflict(conflict, scratch_pool));
+  SVN_ERR(assert_text_conflict(conflict, scratch_pool));
 
   if (base_abspath)
     {