Alex Deucher wrote: > On Sun, Sep 13, 2009 at 4:21 AM, Ian Romanick <i...@freedesktop.org> wrote: >> -----BEGIN PGP SIGNED MESSAGE----- >> Hash: SHA1 >> >> Brian Paul wrote: >> >>> The main problem right now is we have 3 active branches (master, 7.6 >>> and 7.5) and it can be confusing. I wasn't really planning on another >>> 7.5.x release until Eric cherry-picked a bunch of changes to it. I'm >>> still not sure I'll release 7.5.2 in any case. >>> >>> Ian, I'd be happy to see the 7.6 release made at any time. At that >>> time, I'm inclined to abandon the 7.5 branch. Then we'll just have >>> master and one branch to think about. That's pretty easy. >> That sounds good. How about if we release 7.6 and 7.5.2 >> "simultaneously" at XDC. There are a couple bugs that I want to fix >> before 7.6 ships, and I think Eric has a couple as well. He's going to >> be out next week, so I want to give him a chance to wrap things up. I >> expect progress to be slowed during the week of LPC. :) > > There have been a bunch of r600 fixes to master since 7.6 was > branched. If I move new r600 devel to the 7.6 branch, what's the > preferred way to pull the previous r600 changes in master over to the > 7.6 branch?
Cherry picking should work. But remember that new development should occur on master while bug fixes should go on the 7.6 or 7.5 branches. I guess in some cases "bug fixing" looks like "new development"... -Brian ------------------------------------------------------------------------------ Come build with us! The BlackBerry® Developer Conference in SF, CA is the only developer event you need to attend this year. Jumpstart your developing skills, take BlackBerry mobile applications to market and stay ahead of the curve. Join us from November 9-12, 2009. Register now! http://p.sf.net/sfu/devconf _______________________________________________ Mesa3d-dev mailing list Mesa3d-dev@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/mesa3d-dev
