github release procedure

[Johannes Pfau]

Am Fri, 4 Jan 2013 08:20:00 -0800
schrieb "H. S. Teoh" <hsteoh at quickfur.ath.cx>:

> 
> I'm not sure, but in my experience at my day jobs, any bugfix that
> *can* be applied to master (i.e., the code hasn't diverged so much
> that the fix doesn't apply anymore), *should* be. For this reason,
> it's best to always base bugfixes on master, unless the code has
> diverged so much the fix only applies to a particular release branch.
> Otherwise you end up with the problem somebody mentioned, that the
> bug is fixed in a previous release, but is "unfixed" in a later
> release because we neglected to merge the fix into master.

But if you base bug fixes on master you have to merge master into the
release branch to get the bug fixes. But master may contain newly added
features which you don't want in the release branch.

The more I think about it, staging really seems to be useful to avoid
some corner cases.