This is the mail archive of the
java@gcc.gnu.org
mailing list for the Java project.
Re: committing changes to 3.1 branch
- From: Per Bothner <per at bothner dot com>
- To: Nic Ferrier <nferrier at tapsellferrier dot co dot uk>
- Cc: java at gcc dot gnu dot org
- Date: Wed, 20 Mar 2002 17:04:16 -0800
- Subject: Re: committing changes to 3.1 branch
- References: <87663qvjks.fsf@pooh-sticks-bridge.tapsellferrier.co.uk>
Nic Ferrier wrote:
> I have committed the manual changes to the head. Per mentioned
> commiting to the branch as well...
>
> Should I be doing that? Doesn't the branch get merged changes (or
> vice versa?)
No. Automatic merging from the head to the 3.1 branch would be contrary
to the point of the branch, which is to make a solid release. Thus we
need to manually evaluate if a change is important and safe enough to go
into the branch. Automatic merging the other way could be possible,
but also unwise. Sometimes we may check a simple, kludgy, but hopefully
small and safe fix into branch, but a more correct but less safe into
the head.
--
--Per Bothner
per@bothner.com http://www.bothner.com/per/