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 Thu, 18 Dec 2003 07:08:40 GMT
Hi Armin,

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.

we later have to do a merge between HEAD and the branch. Eclipse has a 
*very* good merge wizard to do this in a safe way.

cheers,
Thomas


Armin Waibel wrote:
> Hi all,
> 
> 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?
> 
> regards,
> Armin
> 
> 
> 
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: ojb-dev-unsubscribe@db.apache.org
> For additional commands, e-mail: ojb-dev-help@db.apache.org
> 
> 


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


Mime
View raw message