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:21:25 GMT
Hi tom,

Thomas Dudziak wrote:
> On Thu, 18 Dec 2003 oliver.matz@ppi.de wrote:
> 
<snip>
> I'm only trying to understand so please bear with me ;-)
> I'll state my current understanding a bit differently: suppose a bug
> fix/new feature is to be added
> 
> if is bug fix for 1.0 release
>     fix in maintenance branch
>     add unit test(s) to maintenance branch

+1

>     if is applicable to HEAD (unit tests)
>         fix in HEAD
>         add unit test(s) to HEAD

+1
to save a lot of work here it's recommended to use an automatic merge as 
supported by eclipse.


> else if is bug fix for HEAD
>     fix in HEAD
>     add unit test(s) to HEAD

+1

>     if is applicable to maintenance branch (unit tests)
>         fix in maintenance branch
>         add unit test(s) to maintenance branch
+1
This one is more work as it will involve backport work after some time

> else if is new feature
>     add to HEAD
>     if really really useful and important feature
>         if really sure
>             backport to maintenance branch

-1 No new features to old branches IMO.

cheers
Thomas

> Is that about right ?
> 
> Tom
> 
> 
> 
> ---------------------------------------------------------------------
> 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