git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: configuring cherry-pick to always use -x?

From
Adam Monsen <haircut@gmail.com>
Date
Feb 14, 2011, 21:50 UTC
Message-ID
<4D59A39C.9090402@gmail.com>
In-Reply-To
<AANLkTimi=d0qbO3_-BEnPEJ+iy9B=_fksF7TiBE7HorC@mail.gmail.com>
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

Previous: Junio C HamanoNext: Michael J Gruber
Message 5 of 12 in “configuring cherry-pick to always use -x?”
  1. Adam MonsenFeb 14, 2011
  2. Jay SoffianFeb 14, 2011
  3. Junio C HamanoFeb 14, 2011
  4. Junio C HamanoFeb 14, 2011
  5. Adam MonsenFeb 14, 2011
  6. Michael J GruberFeb 15, 2011
  7. Jonathan NiederFeb 15, 2011
  8. Michael J GruberFeb 15, 2011
  9. Jay SoffianFeb 15, 2011
  10. release maintenance vs. release engineering (was: configuring cherry-pick to always use -x?)Adam Monsen, Feb 15, 2011
  11. Jay SoffianFeb 14, 2011
  12. Ivan KanisFeb 15, 2011

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.