Repository navigation
combinediff should accept an arbitrary number of files #50
Description
splitdiff is able to split a single patch file into multiple (potentially many) patch files. combinediff is able to combine exactly two patch files.
Why is combinediff not a proper inverse of splitdiff? I think that using combinediff to undo the work of splitdiff ought to be straightforward, but it instead seems awkward:
touch combined.tmp
for i in *.patch; do
combinediff combined.tmp "$i" > combined.tmp.new
mv -f combined.tmp.new combined.tmp
done
mv combined.tmp combined.patchI need to:
- Create an empty file as the initial running result.
- Use a shell
forloop, which I usually try to avoid. - Since I want to write to the same file I'm reading from, I need to pipe output to a temporary file first (or use
spongefrommoreutils).
(Is there a better way?)
It would be much nicer if combinediff accepted an arbitrary number of files on the command-line and expected them to be in order. For non-overlapping patches, I then could simply use combinediff *.
I'm using patchutils 0.4.2.
Activity
jamesderlin commentedon Mar 18, 2021
Oh, if all of the patches are non-overlapping, I could just
catthem all together.sergiomb2 commentedon Aug 10, 2021
hello , one day I'd like have time to fix some of these legit issues and also document some important features .
but now I have a doubt , where do I find a "a patch file composed of several incremental patches" ?, or what is a "a patch file composed of several incremental patches" ?
lxop commentedon Nov 22, 2022
The first thing I can think of for a patch composed of several incremental patches is combining Linux kernel patches: if I want to see the difference between kernel 5.10 and 5.15, I need to combine patch-5.11, patch-5.12, patch-13, patch-14, and patch-15. I'm trying to do this at the moment using shell redirection:
or
but it is not working properly for me - while I do get output, I also get an error message
and the patches aren't properly merged. The
-Usuggestion doesn't help.jamesderlin commentedon May 31, 2023
I'm not sure what you're quoting since my original comment didn't mention anything about "incremental patches". I'm simply requesting that
combinediffbe able to easily undosplitdiff.