[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: svn commit: r1186252 - in /subversion/branches/1.7.x-r1180154: ./ subversion/include/svn_sorts.h subversion/libsvn_client/merge.c subversion/libsvn_subr/mergeinfo.c subversion/libsvn_subr/sorts.c subversion/tests/libsvn_subr/mergeinfo-test.c

From: Daniel Shahaf <d.s_at_daniel.shahaf.name>
Date: Wed, 19 Oct 2011 19:33:34 +0200

Paul,

pburba_at_apache.org wrote on Wed, Oct 19, 2011 at 14:57:54 -0000:
> Author: pburba
> Date: Wed Oct 19 14:57:54 2011
> New Revision: 1186252
>
> URL: http://svn.apache.org/viewvc?rev=1186252&view=rev
> Log:
> On the 1.7.x-r1180154 branch: Merge r1180154 from trunk.
>
> * src-branch-1.7.x
> Mergeinfo change only.
>
> * subversion/include/svn_sorts.h
> * subversion/libsvn_client/merge.c
> * subversion/libsvn_subr/sorts.c
> * subversion/tests/libsvn_subr/mergeinfo-test.c
> Clean merge.
>
> * subversion/libsvn_subr/mergeinfo.c
> Got a lot of conflicts arising from the fact that r1149519 has not been
> backported, nor can it be because it revved svn_rangelist_merge to
> svn_rangelist_merge2 and added add a scratch pool. It also claimed to
> modify the "rangelist in-place", but it didn't do all it could do on
> that front (hence r1180154). Since r1180154 is effectively a full-on
> reimplementation of svn_rangelist_merge2 these conflicts don't really
> matter. The only logical difference from r1180154 is that a local
> subpool is used in in place of svn_rangelist_merge2's scratch_pool.

Could you clarify the last paragraph? It definitely describes the
history of the change, but I don't see where it answers the question
"What happened to mergeinfo.c in r1186252?".

Thanks,

Daniel
Received on 2011-10-19 19:34:27 CEST

This is an archived mail posted to the Subversion Dev mailing list.