Merge changes with cloud branch?

[Shalin Shekhar Mangar <sh...@gmail.com>]

Hey Guys,

Do we need to merge changes to trunk to the cloud branch?

-- 
Regards,
Shalin Shekhar Mangar.

Re: Merge changes with cloud branch?

[Shalin Shekhar Mangar <sh...@gmail.com>]

On Fri, Dec 11, 2009 at 4:29 PM, Grant Ingersoll <gs...@apache.org>wrote:

> I think it is the job of the cloud branch to merge to trunk when ready.  I
> don't feel strongly about it, but I suspect that applying patches to both
> all the time would just complicate things for the people working on the
> cloud branch, but I don't feel all that strong about it.
>
>
Actually I was talking about us (working on trunk) merging our changes with
cloud. Yes, it will make working with trunk more complex and I'm happy not
to do it :)

I'd like to wish good luck to the person who will merge cloud back to the
ground :)

-- 
Regards,
Shalin Shekhar Mangar.

Re: Merge changes with cloud branch?

[Grant Ingersoll <gs...@apache.org>]

I think it is the job of the cloud branch to merge to trunk when ready.  I don't feel strongly about it, but I suspect that applying patches to both all the time would just complicate things for the people working on the cloud branch, but I don't feel all that strong about it.

On Dec 11, 2009, at 2:24 AM, Shalin Shekhar Mangar wrote:

> Hey Guys,
> 
> Do we need to merge changes to trunk to the cloud branch?
> 
> -- 
> Regards,
> Shalin Shekhar Mangar.

Re: Merge changes with cloud branch?

[Mark Miller <ma...@gmail.com>]

I would say you *certainly* don't have to. But anyone that's willing  
to, +1 :)

Someone will have to do it. The merge back to trunk will be easy,  
because we will be periodicly merging trunk to cloud.

- Mark

http://www.lucidimagination.com (mobile)

On Dec 11, 2009, at 2:24 AM, Shalin Shekhar Mangar <shalinmangar@gmail.com 
 > wrote:

> Hey Guys,
>
> Do we need to merge changes to trunk to the cloud branch?
>
> -- 
> Regards,
> Shalin Shekhar Mangar.