On Sunday, 12 January 2014 at 19:45:15 UTC, Brad Anderson wrote:
On Sunday, 12 January 2014 at 16:48:08 UTC, Andrei Alexandrescu
wrote:
If we're refraining from or delaying pulling contributions for
undue reasons we're doing something wrong.
Andrei
The Release Process on the wiki[1] does not have a method for a
bugfix only release so it's definitely a problem. Both bugfixes
and features get merged into master.
The release process forbids cherry-picking between branches
(some
rationale for this rule would be nice; it feels like a mistake
to
me) so that can't be used to solve the problem. I don't think
there is a way to do a bugfix only release without
cherry-picking.
If it were me, I'd just would have had both bugfixes and
features
merge into master as described by the release process and have a
2.065 branch which a single person is responsible for
cherry-picking bugfixes into (alternatively you could have
whoever merges the bugfix into master do it).
Frankly, I think the described Release Process is much more
complicated than it needs to be. Fundamentally you only need two
branches at any given time: master and a release branch which
only exists after the feature freeze takes place for an upcoming
release (post-release the branch gets tagged, merged back into
master[2], and deleted).
I had to get this off my chest even if it's unlikely to be
adopted:
http://wiki.dlang.org/Simplified_Release_Process_Proposal