6 Feb 06:21
Re: Proposal: Bcfg2 Branching Model
Raul Cuza <raulcuza <at> gmail.com>
2012-02-06 05:21:53 GMT
2012-02-06 05:21:53 GMT
I've updated http://trac.mcs.anl.gov/projects/bcfg2/wiki/DevelopmentBranchingModel to reflect your feedback. I still believe we should adopt git-flow as a tool for managing merges, tags and publishing. I think this will be justified once I've written up the steps involved with the most common bcfg2.git repository maintenance tasks using it. git-flow does not restrict us to their default workflow, as was proposed in the wiki's original format. The major difference the tool 'imposes' is that the maint branch in git-workflow(7) is replaced by the prefix release/* branches. I don't see this as a bad thing. There will be times, as with v1.2.1, v1.2.2 and v1.3.0, when three or more release branches will need to be worked on at the same time. In this case v1.3.0 work would be committed to master and the other two branches would be release/v1.2.1 and release/v1.2.2. The production branch comes for 'free' with git-flow and has the advantage that diffs and log searches can be handled using branch tools instead of using tags. The difference is not really a big deal because of how git works, but research and troubleshooting with branches is a little easier for me to get my head around. CI, I believe, would do its testing against master and would build releases against tags or the production branch depending on which is easiest to automate. I'll know better when I outline the steps in detail. To summarize:(Continue reading)
RSS Feed