[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Handling of the actively-maintained branches (master, stable-2.0)
From: |
Andreas Rottmann |
Subject: |
Handling of the actively-maintained branches (master, stable-2.0) |
Date: |
Thu, 03 Mar 2011 00:51:46 +0100 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (gnu/linux) |
Hi!
I just noticed that currently, master is mostly not being commited to,
and fixes accumulate in stable-2.0. The exception to this being the
recent change that fixes popen.test (thanks for nailing that one,
Mark!), which has been applied to both branches.
I wonder how this generally should be handled -- I think the most
appropriate way would be to commit any changes that can go into the
stable release into stable-2.0 (only), and then, at "convenient times"
(perhaps always before committing new, not-for-stable stuff to master)
merge stable-2.0 into master. It probably doesn't matter, as git seems
to handle duplicate changes quite well (just tried, except for a
conflict in GUILE-VERSION, stable-2.0 merged cleanly into master, even
with the duplicate changeset). Thoughts?
Regards, Rotty
--
Andreas Rottmann -- <http://rotty.yi.org/>
- Handling of the actively-maintained branches (master, stable-2.0),
Andreas Rottmann <=