5.6: Do it

[Andrew Stanaski]

The cvs branch merging capability is horrible. I would be inclined to do 
what Bert suggested, check in fixes for the 5.6 beta on both branches, and 
add new stuff to the main line only. That still gives purpose to the 
branch, namely to allow development to continue on the main line while 
keeping the 5.6 release line stable. Hopefully there is very little left 
to go into 5.6.

Andy S.

John Ferrier wrote:
> Agree with Bert. As a user, I would like to have all the latest bug fixes. I don't think it is an attractive idea to play with something that problems are only partially fixed.
> JF
> 
> 
> 
> ----- Original Message ----
> From: Bert Wesarg <bert.wesarg at googlemail.com>
> To: NEdit development list <develop at nedit.org>
> Sent: Saturday, October 4, 2008 3:32:59 PM
> Subject: Re: 5.6: Do it
> 
> On Sat, Oct 4, 2008 at 22:16, Scott Tringali
> <scott.tringali at totalviewtech.com> wrote:
> 
>>Bert Wesarg wrote:
>>
>>
>>>I suggest that commits to the BETA-5-6 branch must be first in the MAIN
>>>branch.
>>
>>That defeats the purpose of branching here.  Commit stability fixes to the
>>branch, the mainline can be more experimental.
> 
> Thats true. My intention was that the fix is probably needed in both
> branches. Maybe we can use such policy if we put the BETA-5-6 branch
> into maintenance mode.
> 
> Bert
>