On Sat, 4 Apr 2009 22:14:11 +0200 Christian Faulhammer wrote: > > I'm wondering what our best merge strategy is here. I'm inclined to > > think we're best off fixing all the labels on the eapi-3 branch > > (even if we can't get them displayed or used for named references > > just yet), rebasing that onto master (not much has diverged) once > > we have the go-ahead from the Council either next meeting or the > > one after (probably...) and then doing the cheat-sheet with EAPI 3 > > included on top of that. > > That sounds ok to me. Getting those labels in is the most important > part...so that should be feature wise for every feature listed in > appendix E. Volunteers? I'm going to be with laptop stuck in the middle of wet, miserable, rainy nowhere and relying upon a very slow and dodgy mobile internet connection over Easter weekend, so that'll give me something to do. > > Or were you particularly desperate to get the cheat-sheet in for > > EAPI 2? > > No, a version has been announced and is available for download. So > no haste here. What time frame do you expect to approve EAPI 3? We were sort of hoping either next Council meeting or the one after, assuming Portage support is far enough along that we can say for sure which features are going to be in. So that's either a week off or three weeks off, although obviously these things rarely work as planned... -- Ciaran McCreesh