Re: [sdcc-devel] Any remaining problems with the new allocator

[Borut R. <bor...@gm...>]

I don't think there is a better way. I'll do the merge, since I probably 
know better what I did and why I did it.

Borut


On 03/28/2011 04:30 PM, Maarten Brock wrote:
> Borut,
>
> I think your last (code cleaning) commit broke the z80 code generator.
>
> Maarten
>
>> Am 19.02.2011 08:43, schrieb Borut Ražem:
>>> If you have problems with svn merge, I can do it (actually
>>> I'm already doing it from time to time).
>>>
>>> Borut
>> So far svn merge worked fine. However there now is a problem with your
>> recent code cleaning commits to trunk. These touched lots of lines all
>> over sdcc, resulting in a huge number of conflicts when trying to merge
>> trunk to the optralloc branch. Is there a better way than the very
>> time-consuming one of resolving all of them manually?
>>
>> Philipp
>
> ------------------------------------------------------------------------------
> Enable your software for Intel(R) Active Management Technology to meet the
> growing manageability and security demands of your customers. Businesses
> are taking advantage of Intel(R) vPro (TM) technology - will your software
> be a part of the solution? Download the Intel(R) Manageability Checker
> today! http://p.sf.net/sfu/intel-dev2devmar
> _______________________________________________
> sdcc-devel mailing list
> sdc...@li...
> https://lists.sourceforge.net/lists/listinfo/sdcc-devel
>