From: Adam Monsen <haircut@gmail.com>
To: Junio C Hamano <gitster@pobox.com>, git@vger.kernel.org
Subject: Re: configuring cherry-pick to always use -x?
Date: Mon, 14 Feb 2011 13:50:20 -0800 [thread overview]
Message-ID: <4D59A39C.9090402@gmail.com> (raw)
In-Reply-To: <AANLkTimi=d0qbO3_-BEnPEJ+iy9B=_fksF7TiBE7HorC@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 1689 bytes --]
Junio C Hamano wrote:
> could you please justify in what workflow it would make sense to use
> -x most of the time?
Sure. Summary: two long-lived publicly visible branches.
Details:
Mifos is what I'm usually working on lately. We have branches "master"
and "f-release" both present in our public git repository called "head"
(hosted at sf.net). master is the bleeding edge of development,
f-release is a release maintenance branch recently created off the tip
of master. I expect both to live on forever (even though commits to
f-release will eventually cease).
Right after f-release was cut, we merged f-release to master every day
or so to make sure bugfixes for f-release were also propagated to future
releases. After a while, merging resulted in too many conflicts and we
started cherry picking instead.
This process is described generally at
http://mifosforge.jira.com/wiki/display/MIFOS/Release+Branch+Merging+Policy
.
If the source commit is present in the log message of the new (cherry
picked) commit, it's easy to (1) find the source commit (gitweb creates
a hyperlink, for instance) and (2) know that, when viewing the log of
master, a particular commit is also present on another branch. Right now
I just keep reminding folks to use -x.
For (2), I generally assume that branch is a release branch, but come to
think of it, it would be nice to know what branch a commit was cherry
picked from. For example: "(cherry picked from BRANCHNAME commit
c6e08938e352f3ec99a29a67dd192945d2bcf00d)" would be better than the
current message generated by -x.
See also:
http://mifosforge.jira.com/wiki/display/MIFOS/Mifos+Version+Control+Guide
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 554 bytes --]
next prev parent reply other threads:[~2011-02-14 21:52 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-14 17:19 configuring cherry-pick to always use -x? Adam Monsen
2011-02-14 18:09 ` Jay Soffian
2011-02-14 21:23 ` Junio C Hamano
2011-02-14 21:05 ` Junio C Hamano
2011-02-14 21:50 ` Adam Monsen [this message]
2011-02-15 8:58 ` Michael J Gruber
2011-02-15 9:18 ` Jonathan Nieder
2011-02-15 9:29 ` Michael J Gruber
2011-02-15 16:16 ` Jay Soffian
2011-02-15 21:03 ` release maintenance vs. release engineering (was: configuring cherry-pick to always use -x?) Adam Monsen
2011-02-14 21:53 ` configuring cherry-pick to always use -x? Jay Soffian
2011-02-15 9:38 ` Ivan Kanis
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4D59A39C.9090402@gmail.com \
--to=haircut@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).