>
> OK, please give more details when you have them.
>
Will do
> Sorry, I gave a warning a long time ago, and then decided when to do
> it based on discussions in irc.
>
I don't remember you setting any kind of time frame - you did maillist
questions about 2.5.
Unfortunately the discussion in IRC was probably since Feb 12 ?
The archive is broken.
I don't often join IRC but try to read the archive. I rely on info
from the maillist.
> > 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.
>
Ok
> 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).
I will confirm the components etc before this happens.
2.4 will not go into master or 2.5 anymore will it?
when I merge pncconf into 2.5 then any merges from 2.4
will have a big glade conflict
>
> > 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.
Ahh I see .
>
> > 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.
>
Nothing I know I can do about it other then make sure master and 2.5 are the
same.
hence development is done in pncconf branch.
Cheers Chris M
------------------------------------------------------------------------------
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
