From: Florian Weimer <fw@deneb.enyo.de>
To: git@vger.kernel.org
Subject: Editing patch sequences
Date: Sun, 09 Mar 2008 10:30:16 +0100 [thread overview]
Message-ID: <877igcw8gn.fsf@mid.deneb.enyo.de> (raw)
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.
next reply other threads:[~2008-03-09 9:31 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-03-09 9:30 Florian Weimer [this message]
2008-03-09 9:37 ` Editing patch sequences Jakub Narebski
2008-03-16 11:02 ` Florian Weimer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=877igcw8gn.fsf@mid.deneb.enyo.de \
--to=fw@deneb.enyo.de \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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 NNTP newsgroup(s).