subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Daniel Shahaf <...@daniel.shahaf.name>
Subject Re: svn commit: r1872118 - in /subversion/trunk/subversion: include/private/svn_sorts_private.h libsvn_client/merge.c libsvn_subr/mergeinfo.c libsvn_subr/sorts.c tests/libsvn_subr/mergeinfo-test.c
Date Mon, 30 Dec 2019 18:30:13 GMT
julianfoad@apache.org wrote on Mon, Dec 30, 2019 at 15:42:17 -0000:
> * subversion/libsvn_subr/mergeinfo.c
>   (svn_rangelist_merge2): Extract the body of this function into a local
>     'rangelist_merge2', leaving the original as an error-checking
>     wrapper. If an error occurs, report its inputs.
> 
> +++ subversion/trunk/subversion/libsvn_subr/mergeinfo.c Mon Dec 30 15:42:17 2019
> @@ -1265,40 +1278,98 @@ svn_rangelist_merge2(svn_rangelist_t *ra
>      }
>  
>  #ifdef SVN_DEBUG
> -  SVN_ERR_ASSERT(svn_rangelist__is_canonical(rangelist));
> +  /*SVN_ERR_ASSERT(svn_rangelist__is_canonical(rangelist));*/

Was this change intended to be committed?

>  #endif
>  
>    return SVN_NO_ERROR;
>  }


Mime
View raw message