Re: [MiNT] Helmut branch.... merge ??

[Alan Hourihane <alanh@fairlite.co.uk>]

On 09/01/15 16:13, Helmut Karlowski wrote:
> --------------------------------------------------
> Alan Hourihane <alanh@fairlite.co.uk> wrote:
> (09/01/2015 00:39)
>  
>> How do you feel about your branch stability at the moment ?
> Seems quite stable to me.

Great.

>
>> Is it ready for a merge to the trunk ?
> There's a lot on my todo: most famous:
>
> dynamic file-management (currently I have the old max 32 handles),  
> Not sure if my idea will work though.
>
> tty-stair-fix,
>
> some things with symlink-by-handle (forgot the details).
>
> All in all I don't think it's done during the next few months.
>
> We'd also need to discuss the other enhancements (extended escapes, 
> keyboard in TOS-desktop, ...?)
>

The way to do it would be to merge the trunk into your branch first,
then carry on testing to ensure no breakage from the trunk.

Then it's much easier to merge your branch back to the trunk as
there should be only your changes being merged.

Do you want to merge from the trunk first ?

Alan.