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

how to keeping track of cherry-pick?

From
KBKnut Olav Bøhmer <knut-olav.bohmer@telenor.com>
Date
Jan 20, 2009, 23:53 UTC
Message-ID
<497663E4.4000302@telenor.com>
Hi,

We are changing from subversion to git. We used to merge revisions from development branch to stable with svnmerge.py.

svnmerge.py can give us a list of revisions available for merging. The result is similar to "git log --chery-pick master..dev" The difference is that svnmerge.py operates on revision-numbers, and --chery-pick looks at the diffs. The result of that is that when we get a conflict when a patch is cherry-picked, it will still show up as "available" when I run "git log --cherry-pick master..dev"

svnmerge.py can also mark revisions as blocked, and will not show up in the list of available revisions.

How can I keep track of cherry-picked patches, and mark patches as "blocked", in the same (or similar) way as I did in subversion with svnmerge.py?

-- 
Knut Olav Bøhmer
Next: Junio C Hamano
Message 1 of 6 in “how to keeping track of cherry-pick?”
  1. Knut Olav BøhmerJan 20, 2009
  2. Junio C HamanoJan 21, 2009
  3. Knut Olav BøhmerJan 21, 2009
  4. Michael J GruberJan 21, 2009
  5. Junio C HamanoJan 21, 2009
  6. Johannes SchindelinJan 21, 2009

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.