On Wed, 2009-06-24 at 15:51 -0700, Ian Romanick wrote: > -----BEGIN PGP SIGNED MESSAGE----- > Hash: SHA1 > > Brian Paul wrote: > > > Just a reminder to everyone: if you have bug fixes that should go into > > 7.5 and later, commit them to the mesa_7_5_branch branch. I've been > > periodically merging the 7.5 branch to master. > > I think most people are working on master, so all of our bug fixes show > up there first. I know Eric and I are working that way, anyway. If > master is the tree that is use for on-going development, this seems like > a more logical way. That's why I've been cherry-picking from master to > mesa_7_5_branch. > > We should probably discuss how we want to do this in the future so that > we can avoid future collisions / conflicts. Let's get 7.5 out first. :)
I think there are valid reasons for working on both master and 7.5 -- in particular people are likely to be working on 7.5 if they are in bug-fix mode for a driver intended to be released/distributed based on a stable mesa version. So these bug fixes get committed directly to 7.5 and then there is a periodic merge to master to pull those fixes over. For people working on master, there is a bit more discipline involved -- to either recognise at the time that a particular change should be cherry-picked to 7.5, or to rely on post-hoc cherry-picking of the type that Ian and Brian have done at various points. I think git is robust enough to accomodate both of these usages - the periodic merges from 7.5->master are smart enough to do the right thing with the cherry-picked commits. As it's pretty reasonable to expect that developers will actively be working on stabilizing the stable branch and developing the development branch, it's likely that the current usage will be pretty common going forward, but I think that's OK -- the system pretty much works, though it would of course always be nicer if we didn't have to rely on people doing the post-hoc cherry-picks from master. Keith ------------------------------------------------------------------------------ _______________________________________________ Mesa3d-dev mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/mesa3d-dev
