From: John R. <jo...@no...> - 2011-06-23 11:59:59
|
On 06/23/2011 05:19 AM, David Hicks wrote: > On Thu, 2011-06-23 at 10:39 +0300, Robert Munteanu wrote: >> Since 1.2.x is almost 1 and a half years old, I think that this is a >> good time to wrap up a final 1.2.6 release and put the 1.2 branch into >> critical/security bugfix only mode. > > I agree that a 1.2.6 release is probably needed sometime soon. There are > however quite a number of issues on the 1.2.6 roadmap (see > mantisbt.org/bugs) that I feel need some attention. Many have patches - > although some of these need more work done before applying. Would it be worth it to release 1.2.6 now and have someone focus on claering out the outstanding issues from 1.2.x and then make another release after that happens? Either way, I have no problem putting together a release as long as someone can write up some release notes so covering everything in the update. > ... > > I get the feeling that it would have been better to make many of these > changes to the master branch "as it happens". We're stuck in the > situation at the moment where there are 3-4 very promising development > branches that will not merge together. IMO the source code is not > modular enough at the moment to allow for rewriting major MantisBT > components in branches and then merging them back in again. > > Any thoughts? Perhaps it would be best to take whichever branch has the most divergence, merge that into 1.3.x, and then start some effort on updating the other branches to either reproduce the effort on the new master branch, or try a rebase and start fixing conflicts as they show up. It's going to be a lot of work, but it would be worth it. I'd imagine that the DB rework will likely not abe too affected by the restructuring efforts already in place, other than the files being renamed, so it might be easier to apply the reorg branch first, and then merge the database changes on top of that. If you want some help or guidance with this in Git, grab me on IRC, I'll gladly lend a hand. As for templating, do we actually have any semblance of a completed templating branch in place anywhere? Last I knew, templating efforts were only begun, and didn't yet cover the majority of the codebase. Cheers -- John Reese noswap.com |