On Fri, Mar 11, 2011 at 04:31:24AM +0000, Chris Morley wrote: > > New features. Pncconf was not in master. > It counts on a couple of components to be changed. > mux16 and possibly halmodule. > There may be another component I will have to check.
OK, please give more details when you have them. > Yes I must admit I was expecting a heads up of the 2.5 schedule. > I will have to stabilize my pncconf development for 2.5 Sorry, I gave a warning a long time ago, and then decided when to do it based on discussions in irc. > My plan now will be to merge my pncconf branch to master > very soon, add pncconf to 2.5 and the couple of components > then stabilize it there. It sounds like you should merge pncconf into 2.5 and then 2.5 into master. You should not merge directly into master and then try to also put it in 2.5. That will make future merges difficult. If you have any doubts please ask for help before you do it! We have a very clean setup with 2.4/2.5/master right now based on the 'merging upwards' workflow (man gitworkflows). > Any idea when you will want to release 2.5? Nope, I don't really know yet. > Are you going to release a 2.4.7 ? I think there were bug fixes still left > for that branch. Yes there are sure a lot of changes since 2.4.6. I think several are quite important. It's up to jepler when to release 2.4.7. > The reason for pncconf not being in master was because of Glade. > It's a known bug that Glade changes TONS of stuff when doing some > edits. So I expect to have to develop outside of master again, though > there was work on fixing the problem, I'm not sure in what version. Yeah, merging glade files is definitely hard. You should do everything you can to avoid having any merge conflict in the glade file. ------------------------------------------------------------------------------ Colocation vs. Managed Hosting A question and answer guide to determining the best fit for your organization - today and in the future. http://p.sf.net/sfu/internap-sfd2d _______________________________________________ Emc-developers mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/emc-developers
