From: Richard Purdie <richard.purdie@linuxfoundation.org>
To: Patches and discussions about the oe-core layer
<openembedded-core@lists.openembedded.org>
Subject: Re: Branch management for OE-Core release
Date: Mon, 26 Sep 2011 13:47:05 +0100 [thread overview]
Message-ID: <1317041232.26109.38.camel@ted> (raw)
In-Reply-To: <CAP9ODKqGJ+VxCf8kFcbeaMNwgneLpb-HU2eTpu8w_UM1p-5A6g@mail.gmail.com>
On Mon, 2011-09-26 at 09:27 -0300, Otavio Salvador wrote:
> On Mon, Sep 26, 2011 at 06:23, Richard Purdie
> <richard.purdie@linuxfoundation.org> wrote:
> ...
> > 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...
>
> This breaks the value of using a SCM since you won't have a common parent.
>
> As Chris, I'd prefer to have it merged.
>
> The only way it can complicate issue is if fixes are cherry-picked
> into the stable branch. If they're are done into the stable and merged
> into master this works wonderfully.
No, this just just plain wrong. Changes go into master which is where
development happens. They can then filter into other branches (there may
be more than one) as needed.
To illustate the problem, if a change is needed in two different release
branches you'd commit to both and then cherry-pick both into master?
Cheers,
Richard
next prev parent reply other threads:[~2011-09-26 12:52 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-22 12:49 Branch management for OE-Core release Otavio Salvador
2011-09-22 23:33 ` Richard Purdie
2011-09-23 16:41 ` Otavio Salvador
2011-09-23 17:30 ` Richard Purdie
2011-09-23 18:12 ` Otavio Salvador
2011-09-26 4:59 ` Chris Larson
2011-09-26 9:23 ` Richard Purdie
2011-09-26 12:27 ` Otavio Salvador
2011-09-26 12:47 ` Richard Purdie [this message]
2011-09-26 13:00 ` Otavio Salvador
2011-09-26 14:38 ` Chris Larson
2011-09-26 15:30 ` Otavio Salvador
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1317041232.26109.38.camel@ted \
--to=richard.purdie@linuxfoundation.org \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.