db-ojb-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Thomas Mahler <thm...@web.de>
Subject Re: [CVS] how to merge fixes between main trunk and rc5 branch?
Date Fri, 19 Dec 2003 18:22:58 GMT
Hi Olli,

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


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

View raw message