On 08/25/2011 02:08 PM, Russell Bryant wrote:
Greetings,
We currently only use one branch in our git repo: master. Now that
Matahari is making its way into some Linux distributions, such as Fedora
16 [1], I think it's time to create and maintain a release branch.
--- Create a release branch.
The first thing that needs to be done is to create a new branch, which I
propose be called "release-0.4".
--- Maintain the release branch
There are a few different models that we could follow for maintaining
the release branch. I propose that committers share the responsibility
of maintaining the branch. If the commit you are making is a bug fix,
push it into release-0.4 and then "git cherry-pick -x" it to master.
Otherwise, just push your changes to the branch they are applicable for
as usual.
--- Release tarballs
Once we have the release branch up and going, we should regularly make
release tarballs (matahari-0.4.X). We can plan for doing so roughly
monthly, but the frequency could differ based on the quantity and
severity of bugs that have been fixed.
--- Release maintenance commitment
Given that Matahari is still in heavy development, I would rather not
make any promises about how long a given release series will be
maintained. In the case of the 0.4 release series, which is is in
Fedora 16, it will at least be maintained as long as Fedora 16 is supported.
Let me know what you think. We need to get this settled before we make
any more feature additions to master.
This sounds reasonable to me.
If we're doing roughly monthly tarballs/releases, can we pick a rough
time/date to do it each month? Like: last wednesday of each month or
smth, so that we can have some regularity.