* Distributing revisions to patches in a series
@ 2007-09-07 2:34 Daniel Barkalow
2007-09-07 11:04 ` Johannes Schindelin
0 siblings, 1 reply; 2+ messages in thread
From: Daniel Barkalow @ 2007-09-07 2:34 UTC (permalink / raw)
To: git
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*
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: Distributing revisions to patches in a series
2007-09-07 2:34 Distributing revisions to patches in a series Daniel Barkalow
@ 2007-09-07 11:04 ` Johannes Schindelin
0 siblings, 0 replies; 2+ messages in thread
From: Johannes Schindelin @ 2007-09-07 11:04 UTC (permalink / raw)
To: Daniel Barkalow; +Cc: git
Hi,
On Thu, 6 Sep 2007, Daniel Barkalow wrote:
> 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).
Sounds like you want to read the new section "splitting commits" in
git-rebase.txt ;-)
Hth,
Dscho
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2007-09-07 11:04 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2007-09-07 2:34 Distributing revisions to patches in a series Daniel Barkalow
2007-09-07 11:04 ` Johannes Schindelin
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).