On Sat, Oct 31, 2009 at 5:20 PM, Bert Wesarg <[email protected]> wrote: > On Sat, Oct 31, 2009 at 17:55, Scott Tringali > <[email protected]> wrote: >> PS. >> >> I will gladly handle all the merging and stuff. I use CVS for a living so >> it's all second nature how to do this. >> >> A) Just commit the stuff you want to go to the release on the branch there. >> >> B) Commit stuff you DON'T want to go the release on the mainline. >> >> C) If there's stuff on the mainline you want in the branch, I'd rather >> rehost the branch to the current mainline spot. >> >> IMO, it's better just to Get The Dang Thing out with no merging... > Because the diff between MAIN and BETA-5-6 is really small, we should > bring over the fixes from MAIN, most importantly the fix for #2858723.
Just to keep feeding the fire. How do we proceed from here? My only issue is that I'm having trouble with my Linux box at home, though I don't think it is of any significance in releasing 5.6. >> >> Nice to hear from you all. > I'm joining you in this. > > Bert >> >> -- >> NEdit Develop mailing list - [email protected] >> http://www.nedit.org/mailman/listinfo/develop >> > -- > NEdit Develop mailing list - [email protected] > http://www.nedit.org/mailman/listinfo/develop > -- NEdit Develop mailing list - [email protected] http://www.nedit.org/mailman/listinfo/develop
