{"thread":{"id":"12601","subject":"Editing patch sequences","startedAt":"2008-03-09T09:30:16Z","lastAt":"2008-03-16T11:02:55Z","messageCount":3,"participants":["Florian Weimer","Jakub Narebski"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"71497","messageId":"877igcw8gn.fsf@mid.deneb.enyo.de","threadId":"12601","inReplyTo":null,"subject":"Editing patch sequences","fromName":"Florian Weimer","fromEmail":"fw@deneb.enyo.de","sentAt":"2008-03-09T09:30:16Z","receivedAt":"2008-03-09T09:30:16Z","isPatch":false,"sender":{"key":"fw@deneb.enyo.de","avatar":null},"body":"I've got a patch sequence (a list of file names of patches to apply to\nsome directory tree, not necessarily in quilt format), and I need to\nreorder those patches (for instance, I've got a different version of the\ndirectory tree, but don't want the patch at the beginning of the patch\nsequence, but add the end).  If automatic reordering fails, I'd really\nlike to get some sort of three-way conflict.  After the editing process,\nI want to get back another patch sequence, with as few as possible\ndifferences to the original sequence (e.g., embedded file time stamps\nshould be kept the same, file headers should be preserved, and the order\nof files in the patch should remain unchanged).\n\nHas this already been implemented? \"git rebase --interactive\" comes\nclose, I think.  But minimizing the changes to individual patches seems\na bit of work.\n\nIt's not necessary that this integrates well with other GIT operations,\nall this can happen on some throw-away branch or set of branches.\n"},{"id":"71498","messageId":"m3myp8fdae.fsf@localhost.localdomain","threadId":"12601","inReplyTo":"877igcw8gn.fsf@mid.deneb.enyo.de","subject":"Re: Editing patch sequences","fromName":"Jakub Narebski","fromEmail":"jnareb@gmail.com","sentAt":"2008-03-09T09:37:54Z","receivedAt":"2008-03-09T09:37:54Z","isPatch":false,"sender":{"key":"jnareb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2706?v=4"},"body":"Florian Weimer <fw@deneb.enyo.de> writes:\n\n> I've got a patch sequence (a list of file names of patches to apply to\n> some directory tree, not necessarily in quilt format), and I need to\n> reorder those patches (for instance, I've got a different version of the\n> directory tree, but don't want the patch at the beginning of the patch\n> sequence, but add the end).\n[...]\n\n> Has this already been implemented? \"git rebase --interactive\" comes\n> close, I think.  But minimizing the changes to individual patches seems\n> a bit of work.\n\nYou can try to use one of two Git patch management interfaces: \nStGit or Guilt.\n-- \nJakub Narebski\nPoland\nShadeHawk on #git\n"},{"id":"72216","messageId":"87r6eb0w4g.fsf@mid.deneb.enyo.de","threadId":"12601","inReplyTo":"m3myp8fdae.fsf@localhost.localdomain","subject":"Re: Editing patch sequences","fromName":"Florian Weimer","fromEmail":"fw@deneb.enyo.de","sentAt":"2008-03-16T11:02:55Z","receivedAt":"2008-03-16T11:02:55Z","isPatch":false,"sender":{"key":"fw@deneb.enyo.de","avatar":null},"body":"* Jakub Narebski:\n\n>> Has this already been implemented? \"git rebase --interactive\" comes\n>> close, I think.  But minimizing the changes to individual patches seems\n>> a bit of work.\n>\n> You can try to use one of two Git patch management interfaces: \n> StGit or Guilt.\n\nI had missed that StGit has got three-way merge support.  Fortunately,\nthe need to manage patch sequences has gone away for the time being\n(someone else did it for me 8-).  But I'll report back when the need\nfinally arises.  Thanks.\n"}]}