> Brian Paul ... > BTW, your last sentence can go either way. From my point of view > it's: "Its a lot easier to just fix bugs on the 7.8 branch on > those machines, and when you get around to it later merging > the changes back into master, and dedicating a day to > retesting master on as many configurations as you think > require it for you to be happy with the work done."
Would a regular schedule for merging back to master help, say every Friday or something ? I guess the downside of this is that the fixes that go into a release branch probably wouldn't go in if they weren't important, which argues for merging back to master almost immediately. FWIW this was one of the problems we ran into with a branch-first model - rather than fix/fix/fix/fix/merge we ended up with fix/merge fix/merge fix/merge which was no less effort than a master-first flow. > Also, just because a bug fix works on master is > not a guarantee that it won't cause regressions on the stable > branch. It goes both ways. Amen to that. > > I think the best way to get stable releases is to get people > to work/test more on the stable branches in the first place. >From an observer's point of view this is really the core issue in the sense >that if there were more people working on the release branches then the >conflicting views re: best model would go away. If you strip away the "hey, >I'm already working on master, all my stuff is there" argument the remaining >argument for master-first is that submitting changes there first gives them >some test coverage that they simply won't get in a release branch today. The >question is whether it is practical to get more people working on the release >branches (or even if it's a good use of time, I guess). What I can say after 25 years of mucking around with development process in proprietary SW is that in the end most teams seem to converge on stabilizing in master, branching as late as possible, and making so few changes in the branch that everyone can live with branch-first *or* master-first, whichever is chosen. > Getting everyone to do anything is hard. And I don't know > who has the time to handle that role. My work days at VMware > are pretty full and I don't have as much spare time for Mesa > work as I did in the past. > I didn't quote a lot of your comments about the challenges of leading the mesa project, but IMO the fact that there is such a civilized discussion about development model speaks volumes about how well the project has been managed so far. Debates about development process don't normally go this smoothly ;) _______________________________________________ mesa-dev mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-dev
