[Bug-wget] Extending Wget's git branching model

[Tim Rühsen]

Hi people,

we would like to discuss a slightly amended branching model for Wget with the 
community.

Taking a look at the past release model reveals some managing flaws regarding 
bugfix releases. After a release like e.g. 1.6.0, reported bugs are fixed and 
committed onto 'master'. At the same time new features and other code changes 
are also committed onto 'master'. Eventually we released 1.6.1 (1.6.2, ...) as 
a bugfix release... but as you can see, we tend to introduce new bugs when we 
changed code and/or added new features at the same time. This is not very nice 
for distribution maintainers when they try to create a 'stable' distribution.

Our idea is to create a new branch on each major release. While still all 
codes changes are committed into 'master'. Additionally each bugfix also 
becomes committed into the release branch. we cherry-pick each bugfix from 
master into the release branch. When bug reports settle down (or for other 
reasons like a CVE), we would eventually create a bugfix tag on the release 
branch.

There are much more sophisticated model for release maintenance, but we 
maintainers won't have too much time and prefer a model as-simple-as-possible 
(and as-complex-as-needed).

What do you think, what are your experiences, what are your ideas ?
Any input is appreciated.

Regards, Tim

signature.asc
Description: This is a digitally signed message part.