* new process: cherry-picking to stable releases
@ 2012-11-15 17:30 Sage Weil
2012-11-15 18:37 ` Alex Elder
0 siblings, 1 reply; 2+ messages in thread
From: Sage Weil @ 2012-11-15 17:30 UTC (permalink / raw)
To: ceph-devel
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.
Thanks!
sage
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: new process: cherry-picking to stable releases
2012-11-15 17:30 new process: cherry-picking to stable releases Sage Weil
@ 2012-11-15 18:37 ` Alex Elder
0 siblings, 0 replies; 2+ messages in thread
From: Alex Elder @ 2012-11-15 18:37 UTC (permalink / raw)
To: Sage Weil; +Cc: ceph-devel
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-11-15 18:37 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-11-15 17:30 new process: cherry-picking to stable releases Sage Weil
2012-11-15 18:37 ` Alex Elder
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.