How to merge all patches into one?

Question

linux

Hello!
There is, for example, a product and its sources (for example, samba).
There are also stopizzot patches.
If we apply five or six patches to one file, then we cannot apply subsequent patches, because. strings don't match after changing the first five or six patches. This is logical.
I know for sure that it is possible to add all the necessary patches into one, taking into account all the changes, and get one cumulative patch at the output.
But I can't remember or google anything.
It seems like I once used patchutils (interdiff and others like it), but something doesn't work now.
Who will tell you the right way to solve the problem?

Answer 1

if these patches were applied one after another, then you need to roll them in the same way (thanks, cap))))
if each of these hundred patches were made to "vanilla" sources, then it is unlikely that it will be possible to merge from "just like that"
however, I I would try this option:
put each patch into its own git branch (does samba already live there?), And merge all the branches together - the output should be what you are looking for, if there are no conflicts))
Git applies patches more intelligently, it does not focus on Line NUMBERS, as patch does, it focuses on the CONTEXT of the patch (all these lines are BEFORE and AFTER the changes; because of this, by the way, I once had a bug when merging)))

Answer 2

as far as i know no way