On Sat, Aug 04, 2007 at 01:41:25AM -0400, Pavel Roskin wrote: > [quote] > Sometimes, I just make patches in quilt, then I do "quilt > refresh", "quilt pop -a", "cd patches" and modify the patches > and series file manually, e.g. by moving one patch from one file > into the other. > [end of quote] FWIW, I have written a couple of scripts to help moving stuff around between patches. Those are not yet integrated in stgit proper, and it happens that the 0.13 tarball does not contain them, they are only available from the git tree (better use my tree[1], since I updated them recently). Most notably relevant to this use are stg-fold-files-from and stg-dispatch, to move diff hunks between patches. They only cases (off the top of my hand) where they do not fit my needs are: - when I need to move a part of a diff hunk that is not possible to isolate using -U<n> (but I have read interesting things about git-gui for such functionnality, so that will surely come one day) - when I need to move git-specific diff hunks (moves, permissions, etc.), since it uses filterdiff, which is not git-aware (yet ?) (in short, there are lots of dev to do in/around stgit, but there are not as many contributors as there is for git - hint, hint ;) If there are other typical situations where they need to edit patches, I'd be interested to hear about them. Not to avoid implementing patch edition in stgit, since it is occasionally useful to fix a typo when reviewing at refresh time, but to see what higher-level tools we could provide. Best regards, -- Yann [1] gitweb at http://repo.or.cz/w/stgit/ydirson.git - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
