Re: Branch management for OE-Core release

[Richard Purdie <richard.purdie@linuxfoundation.org>]

On Fri, 2011-09-23 at 15:12 -0300, Otavio Salvador wrote:
> On Fri, Sep 23, 2011 at 14:30, Richard Purdie
> <richard.purdie@linuxfoundation.org> wrote:
> ...
> > I don't really see the point of this. Basically you're asking that every
> > time there is a commit to the branch there is also a merge commit. You
> > can just as easily either force a checkout of master, or merge against
> > master with a one sided merge. Git doesn't have the confidence to do
> > that automatically but I'm pretty sure there is a simple way to tell git
> > to do a one sided merge...
> 
> Not every time but at every release and point release.
> 
> one sided merge make you lose all local changes you did. Doesn't seems
> a valid upgrade path but a "replace path".

Equally, merging against master would make things much more difficult
for anyone wanting to cherry-pick patches over which we've not picked in
the main release branch. Since creating "enhanced" rellease branches is
something we want to support/encourage, I'm still not convinced a load
of merge commits are a good idea.

FWIW, something like git cherry can identify your local changes so you
could apply them on top of master so there are other ways to make your
usecase work...

Cheers,

Richard