threads / discuss / 12601

Editing patch sequences

Subject: Editing patch sequences

## tl;dr

3 messages between Mar 9, 2008 and Mar 16, 2008.

replies: 2people: 2as markdown or json

Florian Weimer· Mar 9, 2008, 09:30 UTC · lore

I've got a patch sequence (a list of file names of patches to apply to some directory tree, not necessarily in quilt format), and I need to reorder those patches (for instance, I've got a different version of the directory tree, but don't want the patch at the beginning of the patch sequence, but add the end). If automatic reordering fails, I'd really like to get some sort of three-way conflict. After the editing process, I want to get back another patch sequence, with as few as possible differences to the original sequence (e.g., embedded file time stamps should be kept the same, file headers should be preserved, and the order of files in the patch should remain unchanged).

Has this already been implemented? "git rebase --interactive" comes close, I think. But minimizing the changes to individual patches seems a bit of work.

It's not necessary that this integrates well with other GIT operations, all this can happen on some throw-away branch or set of branches.

Jakub Narebski· Mar 9, 2008, 09:37 UTC · re: Florian Weimer · lore

Re: Editing patch sequences

Florian Weimer <fw@deneb.enyo.de> writes:

Show 5 quoted lines

> I've got a patch sequence (a list of file names of patches to apply to
> some directory tree, not necessarily in quilt format), and I need to
> reorder those patches (for instance, I've got a different version of the
> directory tree, but don't want the patch at the beginning of the patch
> sequence, but add the end).

[...]

> Has this already been implemented? "git rebase --interactive" comes
> close, I think.  But minimizing the changes to individual patches seems
> a bit of work.

You can try to use one of two Git patch management interfaces: StGit or Guilt.

-- 
Jakub Narebski
Poland
ShadeHawk on #git

Florian Weimer· Mar 16, 2008, 11:02 UTC · re: Jakub Narebski · lore

Re: Editing patch sequences

* Jakub Narebski:

Show 6 quoted lines

>> Has this already been implemented? "git rebase --interactive" comes
>> close, I think.  But minimizing the changes to individual patches seems
>> a bit of work.
>
> You can try to use one of two Git patch management interfaces: 
> StGit or Guilt.

I had missed that StGit has got three-way merge support. Fortunately, the need to manage patch sequences has gone away for the time being (someone else did it for me 8-). But I'll report back when the need finally arises. Thanks.