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

Distributing revisions to patches in a series

From
Daniel Barkalow <barkalow@iabervon.org>
Date
Sep 7, 2007, 02:34 UTC
Message-ID
<Pine.LNX.4.64.0709062219320.13907@iabervon.org>

I was wondering if anybody's got a good process for the following situation: I've just rebased a series onto the new origin/next. In the afterwards, I determined that some of the intermediate merges weren't right (the patch to split bundle-handling out of builtin-bundle didn't pick up fixes to builtin-bundle). I also found and fixed a warning added by my series. I want to take these changes, split them into individual hunks, and apply each hunk to the appropriate commit from the series before that commit, generating a new series.

I know how to do it by figuring out where the hunk should go myself and branching, fixing, and rebasing, but I was wondering if there was a magic script to just do it. It seems like it should be an automatable operation (take the last commit as a set of hunks, and walk back up the history, leaving each one at the oldest commit to which it applies cleanly; when all of the hunks are allocated, generate a new history by amending commits).

	-Daniel
*This .sig left intentionally blank*
Next: Johannes Schindelin
Message 1 of 2 in “Distributing revisions to patches in a series”
  1. Daniel BarkalowSep 7, 2007
  2. Johannes SchindelinSep 7, 2007

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.