如何使用TortoiseSVN从不同版本之间的差异创建补丁？ [英] How do I create a patch from diff between revisions using TortoiseSVN?

问题描述

我正在一个使用Subversion维护版本控制的项目中。我使用TortoiseSVN访问项目存储库。

I'm working on a project where Subversion is used to maintain version control. I use TortoiseSVN to access the project repository.

在项目的两个修订之间进行了一些更改（我们将其称为rev1和rev2），我希望能够将这些更改应用于暂时无法访问存储库的工作副本。

Some changes were made between two revisions on a project (let's call them rev1 and rev2), and I want to be able to apply these changes to a working copy somewhere that temporarily does not have access to the repository.

我右键单击项目文件夹，单击 SVN show log，选中两个修订，然后选择将更改显示为统一差异。

I right-clicked on a project folder, clicked 'SVN show log', selected the two revisions and selected 'Show changes as unified diff'.

这将导致显示一个窗口，显示的输出看起来就像是我可以保存的补丁文件。不幸的是，我发现窗口中没有选项可以将其另存为补丁文件。

This causes a window to be shown, displaying output that very much looks like a patch file that I could save. Unfortunately, I find that there is no option in the window that lets me save this as a patch file.

如何创建补丁文件？

推荐答案

下一版TortoiseSVN（1.7.x）将具有该保存选项。同时，您可以将纯文本编辑器配置为统一的差异查看器：

The next version of TortoiseSVN (1.7.x) will have that save option. In the meantime, you can configure a plain text editor as your unified diff viewer:

Settings dialog->External Programs->Unified Diff Viewer

例如，可以指定 notepad.exe 作为您的差异查看器。

There you could, for example, specify notepad.exe as your diff viewer.

这篇关于如何使用TortoiseSVN从不同版本之间的差异创建补丁？的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！