On Thursday, 20 December 2012 at 23:43:12 UTC, Joseph Cassman wrote:
Just some food for thought.

In the section about the "Branching model", the wiki currently has a staging branch in addition to the master branch. From what I understand, the idea seems to be to vet a release on staging until it is considered production level and then marked as the release.

Another idea could be to keep the quality of the master branch at a high level so as to be able to branch into a release at any time, directly from master. Before feature branches are merged back into master, their quality is vetted so the quality of master is maintained.

This idea seems similar to what is used for the vibe.d project (http://vibed.org/temp/branch-model-small.png). My apologies if I misunderstood their process.

It looks like Xamarin has been using this process for a while and it seems to be working for them. http://tirania.org/blog/archive/2011/Oct-14.html

Joseph

Doesn't that just turn master into staging, and turn the feature branches into a diluted and distributed version of master?

If there's no common development branch to work with that integrates the most current features together, then how will such a thing ever be properly tested before going into a high quality common branch?

We also need the ability to stop brand new poorly tested features from making their way into a release, so at some point a common pre-release branch needs to be frozen from receiving any new features so that it can be honed into a high quality product. If you use the master branch for such a thing, then no new features can go into it, so with master frozen, what common branch is available for the devs to merge their new work into?

--rt

Reply via email to