dev@glassfish.java.net

Re: workspace/branches merge

From: Sahoo <sahoo_at_sun.com>
Date: Fri, 10 Oct 2008 17:52:02 +0530

I would also like to add that we should immediately port the changes to
trunk to avoid seeing difference in behavior between trunk build and
branch build.

Thanks,
Sahoo

Jerome Dochez wrote:
> In case this was not clear, I want to remind folks that we will *not*
> do an automatic merge between the prelude branch and the trunk so each
> fix that you checkin in the branch needs to be manually ported to the
> trunk if it applies.
>
> For example this is how I just merged a checkin I did in the branch :
>
> svn merge -r 23283:23284
> https://svn.dev.java.net/svn/glassfish-svn/branches/v3_prelude_release
>
> for more info, go to [1]
>
> Jerome
>
> [1] http://svnbook.red-bean.com/en/1.1/ch04s03.html
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe_at_glassfish.dev.java.net
> For additional commands, e-mail: dev-help_at_glassfish.dev.java.net
>