[haiku-development] Re: Stack & Tile update
- From: Joseph Prostko <joe.prostko+haiku@xxxxxxxxx>
- To: haiku-development@xxxxxxxxxxxxx
- Date: Fri, 16 Oct 2009 17:39:34 -0400
On Fri, Oct 16, 2009 at 2:46 PM, Joseph Prostko
<joe.prostko+haiku@xxxxxxxxx> wrote:
> On Fri, Oct 16, 2009 at 4:37 PM, Urias McCullough <umccullough@xxxxxxxxx>
> wrote:
>> On Fri, Oct 16, 2009 at 7:39 AM, Joseph Prostko
>> <joe.prostko+haiku@xxxxxxxxx> wrote:
>>> Yeah, the stack-and-tile.diff doesn't apply cleanly to r33609,
>>> unfortunately.
>>
>> Might it be easier to apply it to a historical revision and svn up to
>> the latest?
>>
>> You can for example revert your tree to an older one with svn up -R 32151
>>
>
> Yeah, that had crossed my mind, but then I decided to dabble on some
> GCC work instead. I'll try what you suggested later tonight after I
> get home, and if things apply cleanly and Stack and Tile seems to
> work, I'll attach a patch to a newer SVN revision to this ticket. If
> I get conflicts and there is obvious work involved, I'll most likely
> not mess with it any further.
>
First off, not sure why I referred to this email thread as a ticket. :)
As an update though, the last revision the patch applies cleanly to is
32242. I applied the patch to that, and then did an "svn up", which
resulted in conflicts in Window.h, Desktop.h, ServerWindow.cpp,
Window.cpp, and Desktop.cpp (in src/servers/app).
I may get around to looking into the issues later this weekend, but
thought I'd mention where the situation lies in case somebody wants to
take a crack at it before me or Ryan or Hong.
- joe
Other related posts:
