如何在OS X中以可视方式使用/创建.diff .patch文件? [英] How to visually consume/create .diff .patch files in OS X?

问题描述

对不起，我只是找不到任何可以做到这一点的东西！例如，我得到30个文件的大文件.diff..当然，我可以使用 patch 并将其应用于我的源基线.但是，我希望能够使用该.diff和我的源代码树，并以交互方式查看这些更改，以查看diff并有选择地合并或忽略各节.

Sorry, I'm just not finding anything that can do this! For example I get a big fat .diff of 30 files.. sure, I can use patch and apply that to my source baseline. But, I'd hope to be able to take that .diff and my source tree and interactively view those changes to review the diff and optionally merge in or ignore sections.

推荐答案

签出 opendiff ，它是Mac OS X开发人员工具(XCode)的一部分.它不能完全按照您想要的方式工作(直接在.diff文件上)，但是您可以临时复制源代码树，应用差异，然后运行opendiff进行直观比较.然后，您可以有选择地合并并选择要包含的每个更改的版本.

Check out opendiff which is part of Mac OS X Developer Tools (XCode). It won't work exactly how you want (directly on .diff files), but you can make a temp copy of your source tree, apply your diffs, then run opendiff to compare visually. You can then selectively merge and choose which version of each change to include.

这篇关于如何在OS X中以可视方式使用/创建.diff .patch文件?的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！