Mailing-List: contact ojb-dev-help@db.apache.org; run by ezmlm
Precedence: bulk
Reply-To: "OJB Developers List" <ojb-dev@db.apache.org>
Message-ID: <3FE34202.1040005@web.de>
Date: Fri, 19 Dec 2003 19:22:58 +0100
From: Thomas Mahler <thma32@web.de>
Reply-To: thma@apache.org
Organization: Apache Foundation
User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.4) Gecko/20030821
MIME-Version: 1.0
To: OJB Developers List <ojb-dev@db.apache.org>
Subject: Re: [CVS] how to merge fixes between main trunk and rc5 branch?
References: <6D48B8403D926449BDE8440EC7EEC46D01010FE8@max.ppinet.de>
In-Reply-To: <6D48B8403D926449BDE8440EC7EEC46D01010FE8@max.ppinet.de>
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Transfer-Encoding: 7bit
Sender: thma32@web.de

Hi Olli,

I guess you are right.
I did it the wrong way until now, but I'll start with your approach now.

cheers,
Thomas

oliver.matz@ppi.de wrote:
> Hello,
> 
> 
>>-----Original Message-----
>>
>>I guess before a final 1.0 relese all changes, fixes for 1.0 and new 
>>features should be checked into the main HEAD trunk.
> 
> 
> I disagree.  Fixes should be done in the oldest supported
> version and than merged into the newer ones.
> Otherwise you might unintentionally merge new source code
> in the maintenance branch.
> 
> I our case that means: if there is a bug in 1.0.x and 
> in the trunc, decide whether a fix in the 1.0.x branch 
> is desired.  If so, fix it in that branch and than merge 
> it into the trunc.  Otherwise, document it in the 1.0.x 
> branch as "won't fix" and fix it in the trunc.
> 
> 
>>>I want to know what's the best procedure for check-in fixes
>>>between main trunk and rc5 branch?
>>>
>>>Should I check-in in main trunk and we merge files with rc5 branch 
>>>before 1.0 or contrary? Or should I check-in both?
> 
> 
> Olli


---------------------------------------------------------------------
To unsubscribe, e-mail: ojb-dev-unsubscribe@db.apache.org
For additional commands, e-mail: ojb-dev-help@db.apache.org