From: Andreas Oberritter <obi@opendreambox.org>
To: openembedded-devel@lists.openembedded.org
Subject: Merging the release branch into master (was: Re: Revert commit c2c8fe4c5629add94bd0b922f5b3446624a9f4d8)
Date: Mon, 22 Nov 2010 15:29:47 +0100 [thread overview]
Message-ID: <4CEA7E5B.7070900@opendreambox.org> (raw)
In-Reply-To: <AANLkTikc4Pm+kgyym+Qdd32R3gPo1HX4QtWE0yCf3ykb@mail.gmail.com>
On 11/21/2010 06:55 PM, Chris Larson wrote:
> The release branch is being merged back to master after the release is
> tagged, FYI.
I've been thinking about it, but I'm not really sure what the point is
in that if all fixes should already be in master before entering the
release branch, except for maybe some release-branch specific stuff
(which in turn must not exist, because it would get merged into master
after release has been tagged)? You can't even put some release notes
into the release branch?
Also, a revert can be reverted again, if needed, before a merge, i.e.
revert, tag, release, unrevert, merge, delete.
next prev parent reply other threads:[~2010-11-22 14:31 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-11-19 22:28 Revert commit c2c8fe4c5629add94bd0b922f5b3446624a9f4d8 Philip Balister
2010-11-21 0:31 ` Philip Balister
2010-11-21 0:45 ` Yury Bushmelev
2010-11-21 14:56 ` Andreas Oberritter
2010-11-21 16:17 ` Khem Raj
2010-11-21 17:23 ` Andreas Oberritter
2010-11-21 17:55 ` Chris Larson
2010-11-22 14:29 ` Andreas Oberritter [this message]
2010-11-22 16:39 ` Merging the release branch into master (was: Re: Revert commit c2c8fe4c5629add94bd0b922f5b3446624a9f4d8) Chris Larson
2010-11-21 18:05 ` Revert commit c2c8fe4c5629add94bd0b922f5b3446624a9f4d8 Philip Balister
2010-11-21 20:09 ` Yury Bushmelev
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=4CEA7E5B.7070900@opendreambox.org \
--to=obi@opendreambox.org \
--cc=openembedded-devel@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.