Re: any good diff merging utility?

[Riley Williams]

Hi Ivan.

 > I like to build kernels with a bunch of patches on top to test
 > new stuff. The problem is that it takes a lot of effort to fix
 > all the failed hunks during patching that really wouldn't have
 > to be failed if only patch was a little more inteligent and
 > could merge several patches into one ( if possible) or if could
 > take into account already applied patches.

The basic problem here is that the "failed hunks" are usually there
because of conflicts between the two patches in question, and as a
result, they are not as easy to merge automagically as one might at
first assume.

 > Well, are there any utilities to merge diffs? I couldn't find
 > any on freshmeat. So what are you using to stack many patches
 > onto the kernel tree? Just manualy modify the diff? I'll try to
 > write something more automatic if nothing comes up.

I once came across a utility called "diff3" that was designed to take
a patch for one version of a package and create an equivalent patch
for another version of the same package, but I haven't been able to
find it again since my hard drive crashed.

Best wishes from Riley.