From: Alex Elder <elder@inktank.com>
To: Sage Weil <sage@inktank.com>
Cc: ceph-devel@vger.kernel.org
Subject: Re: new process: cherry-picking to stable releases
Date: Thu, 15 Nov 2012 12:37:07 -0600 [thread overview]
Message-ID: <50A53653.40204@inktank.com> (raw)
In-Reply-To: <alpine.DEB.2.00.1211150926180.26823@cobra.newdream.net>
On 11/15/2012 11:30 AM, Sage Weil wrote:
> If you are *ever* cherry-picking something to an older stable branch,
> please use
>
> git cherry-pick -x <sha1>
>
> That will append a '(cherry-picked from ....)' message to the bottom of
> the commit, allowing us to always find the original commit that we are
> duplicating.
>
> This implies that we are always committing to the master/next branch
> *first*, and then cherry-picking to stable. As a general rule, a fix
> should always be 'upstream' first in the new branches before it is
> backported to something older. The exception is fix that is unique to the
> stable branch, for example because the new code has changed.
It also implies--or to be useful requires--that anything committed
to master is pretty much permanent (and never rebased). The master
branch should be considered append-only.
-Alex
prev parent reply other threads:[~2012-11-15 18:37 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-15 17:30 new process: cherry-picking to stable releases Sage Weil
2012-11-15 18:37 ` Alex Elder [this message]
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=50A53653.40204@inktank.com \
--to=elder@inktank.com \
--cc=ceph-devel@vger.kernel.org \
--cc=sage@inktank.com \
/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.