我有一个文件和一个补丁。我想直观地应用补丁，t.i.查看补丁提出的更改在上下文中的外观，进行一些更正，然后保存生成的文件。

什么工具可以做到这一点？

视觉差异工具(即融合、扩散、差异合并)都不能满足我的要求:它们不能处理补丁，它们只是合并整个文件。

最佳答案

我真的很喜欢 Kompare。它只是一个(非常好的)差异图形界面。

http://www.caffeinated.me.uk/kompare/

sudo apt-get install kompare

Creating and applying patches

Kompare is able to create a patch file which lists only the differences between two compared text files A and B. Further, Kompare can apply a patch file which was created this way to an original file A and, in this manner, recompute the contents of the corresponding file B. This is a comfortable utility for passing a corrected version of a file to a friend who already has an older version of the same file, because only the (relatively small) patch file has to be delivered and the receiver can generate the corrected file by applying the patch to the original file.

The patches created and applied by Kompare are compatible to patch files generated or applied by the command line interface diff utility, because Kompare is in fact merely a graphical front end to diff and the patches are created and applied by patch, which gets called by Kompare.

https://stackoverflow.com/questions/1879770/