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 2011/10/19 19:33:34 UTC
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
Paul,
pburba@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
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
Posted by Daniel Shahaf <d....@daniel.shahaf.name>.
Paul Burba wrote on Wed, Oct 19, 2011 at 14:58:06 -0400:
> It may be a moot point now, since this has already been backported,
> but I adjusted the log message to better explain what I meant:
> http://svn.apache.org/viewvc?view=revision&revision=1186252
>
> Hopefully that clears things up, let me know if you still have any concerns.
Looks good to me. On behalf of future code archeologists, thanks :-)
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
Posted by Daniel Shahaf <d....@daniel.shahaf.name>.
Paul Burba wrote on Wed, Oct 19, 2011 at 14:58:06 -0400:
> It may be a moot point now, since this has already been backported,
> but I adjusted the log message to better explain what I meant:
> http://svn.apache.org/viewvc?view=revision&revision=1186252
>
> Hopefully that clears things up, let me know if you still have any concerns.
Looks good to me. On behalf of future code archeologists, thanks :-)
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
Posted by Paul Burba <pt...@gmail.com>.
On Wed, Oct 19, 2011 at 1:33 PM, Daniel Shahaf <d....@daniel.shahaf.name> wrote:
> Paul,
>
> pburba@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?".
Hi Daniel,
It may be a moot point now, since this has already been backported,
but I adjusted the log message to better explain what I meant:
http://svn.apache.org/viewvc?view=revision&revision=1186252
Hopefully that clears things up, let me know if you still have any concerns.
Paul
> Thanks,
>
> Daniel
>
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
Posted by Paul Burba <pt...@gmail.com>.
On Wed, Oct 19, 2011 at 1:33 PM, Daniel Shahaf <d....@daniel.shahaf.name> wrote:
> Paul,
>
> pburba@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?".
Hi Daniel,
It may be a moot point now, since this has already been backported,
but I adjusted the log message to better explain what I meant:
http://svn.apache.org/viewvc?view=revision&revision=1186252
Hopefully that clears things up, let me know if you still have any concerns.
Paul
> Thanks,
>
> Daniel
>