{"thread":{"id":"9813","subject":"Distributing revisions to patches in a series","startedAt":"2007-09-07T02:34:24Z","lastAt":"2007-09-07T11:04:00Z","messageCount":2,"participants":["Daniel Barkalow","Johannes Schindelin"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"52836","messageId":"Pine.LNX.4.64.0709062219320.13907@iabervon.org","threadId":"9813","inReplyTo":null,"subject":"Distributing revisions to patches in a series","fromName":"Daniel Barkalow","fromEmail":"barkalow@iabervon.org","sentAt":"2007-09-07T02:34:24Z","receivedAt":"2007-09-07T02:34:24Z","isPatch":false,"sender":{"key":"barkalow@iabervon.org","avatar":"https://avatars.githubusercontent.com/u/55364219?v=4"},"body":"I was wondering if anybody's got a good process for the following \nsituation: I've just rebased a series onto the new origin/next. In the \nafterwards, I determined that some of the intermediate merges weren't \nright (the patch to split bundle-handling out of builtin-bundle didn't \npick up fixes to builtin-bundle). I also found and fixed a warning added \nby my series. I want to take these changes, split them into individual \nhunks, and apply each hunk to the appropriate commit from the series \nbefore that commit, generating a new series.\n\nI know how to do it by figuring out where the hunk should go myself and \nbranching, fixing, and rebasing, but I was wondering if there was a magic \nscript to just do it. It seems like it should be an automatable operation \n(take the last commit as a set of hunks, and walk back up the history, \nleaving each one at the oldest commit to which it applies cleanly; when \nall of the hunks are allocated, generate a new history by amending \ncommits).\n\n\t-Daniel\n*This .sig left intentionally blank*\n"},{"id":"52895","messageId":"Pine.LNX.4.64.0709071202570.28586@racer.site","threadId":"9813","inReplyTo":"Pine.LNX.4.64.0709062219320.13907@iabervon.org","subject":"Re: Distributing revisions to patches in a series","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2007-09-07T11:04:00Z","receivedAt":"2007-09-07T11:04:00Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Thu, 6 Sep 2007, Daniel Barkalow wrote:\n\n> I was wondering if anybody's got a good process for the following \n> situation: I've just rebased a series onto the new origin/next. In the \n> afterwards, I determined that some of the intermediate merges weren't \n> right (the patch to split bundle-handling out of builtin-bundle didn't \n> pick up fixes to builtin-bundle). I also found and fixed a warning added \n> by my series. I want to take these changes, split them into individual \n> hunks, and apply each hunk to the appropriate commit from the series \n> before that commit, generating a new series.\n> \n> I know how to do it by figuring out where the hunk should go myself and \n> branching, fixing, and rebasing, but I was wondering if there was a \n> magic script to just do it. It seems like it should be an automatable \n> operation (take the last commit as a set of hunks, and walk back up the \n> history, leaving each one at the oldest commit to which it applies \n> cleanly; when all of the hunks are allocated, generate a new history by \n> amending commits).\n\nSounds like you want to read the new section \"splitting commits\" in \ngit-rebase.txt ;-)\n\nHth,\nDscho\n"}]}