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

Re: svn commit: r1149001 - /subversion/trunk/subversion/libsvn_client/merge.c

From: Greg Stein <gstein_at_gmail.com>
Date: Wed, 20 Jul 2011 23:21:54 -0400

No worries! Figured you were already away for the night, too.

Or we can say you owe me a quick fix next time I bunk up the build ;-)

Cheers,
-g

On Wed, Jul 20, 2011 at 22:55, Paul Burba <ptburba_at_gmail.com> wrote:
> Sorry about that.  r1149001 was part of a larger patch I'm working on, but
> obviously it didn't stand on it's own.  Thanks for fixing.
>
> Paul
>
> On Jul 20, 2011 10:28 PM, "Greg Stein" <gstein_at_gmail.com> wrote:
>> Fixed in r1149010.
>>
>> On Wed, Jul 20, 2011 at 22:20, Greg Stein <gstein_at_gmail.com> wrote:
>>> On Wed, Jul 20, 2011 at 21:11,  <pburba_at_apache.org> wrote:
>>>>...
>>>> +++ subversion/trunk/subversion/libsvn_client/merge.c Thu Jul 21
>>>> 01:11:27 2011
>>>>...
>>>> @@ -8146,10 +8146,10 @@ remove_noop_subtree_ranges(const char *u
>>>>                                                  youngest_gap_rev->end,
>>>>                                                  TRUE, scratch_pool);
>>>>   SVN_ERR(svn_rangelist_remove(&(inoperative_ranges),
>>>> -                               log_gap_baton.operative_ranges,
>>>> +                               operative_ranges,
>>>>                                inoperative_ranges, FALSE,
>>>> scratch_pool));
>>>>
>>>> -  SVN_ERR(svn_rangelist_merge(&(log_gap_baton.merged_ranges),
>>>> +  SVN_ERR(svn_rangelist_merge(&merged_ranges,
>>>>                               inoperative_ranges, scratch_pool));
>>>
>>> I think it is this change, but I'm having problems in my local
>>> environment to test. In short: you're not getting the merged stuff
>>> back into the baton.
>>>
>>> Will try and get this fixed/tested...
>>>
>>> Cheers,
>>> -g
>>>
>
Received on 2011-07-21 05:22:45 CEST

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