You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Daniel Shahaf <d....@daniel.shahaf.name> on 2019/12/30 18:30:13 UTC
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
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;
> }
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
Posted by Julian Foad <ju...@apache.org>.
Julian Foad wrote:
> Daniel Shahaf wrote:
>>> - SVN_ERR_ASSERT(svn_rangelist__is_canonical(rangelist));
>>> + /*SVN_ERR_ASSERT(svn_rangelist__is_canonical(rangelist));*/
>>
>> Was this change intended to be committed?
>
> [...] Thanks for noticing. I will come back to it.
I restored this assertion in r1872924 and then completely replaced the
function while fixing the issue in r1873297.
- Julian
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
Posted by Julian Foad <ju...@apache.org>.
Daniel Shahaf wrote:
>> - SVN_ERR_ASSERT(svn_rangelist__is_canonical(rangelist));
>> + /*SVN_ERR_ASSERT(svn_rangelist__is_canonical(rangelist));*/
>
> Was this change intended to be committed?
I did not intend to leave it like that, but it is something I still need
to review in the area of better defining the canonicalization rules.
Thanks for noticing. I will come back to it.
- Julian