比较 TortoiseSVN 中两个分支之间的文件
我知道如何在 SVN 中做到这一点,
svn diff http://svn.example.com/branches/A/File1.txt http://svn.example.com/branches/B/File1.txt
但是在 TortoiseSVN 中必须有一种不那么痛苦的方法来做到这一点。您可能认为可以从“显示日志”中执行此操作,但它似乎只显示当前分支上的修订。
I know how to do this in SVN,
svn diff http://svn.example.com/branches/A/File1.txt http://svn.example.com/branches/B/File1.txt
But there has to be a less painful way to do this in TortoiseSVN. You would think that you could do it from the Show Log, but it appears to only show revisions on the current branch.
如果你对这篇内容有疑问,欢迎到本站社区发帖提问 参与讨论,获取更多帮助,或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱,如果其他用户或者作者回复了您的评论,将不能在第一时间通知您!
发布评论
评论(4)
我不知道这个功能有多新(我当然阅读了文档,但在发布问题时没有找到它),但是如果您在右键单击某个功能时按住 Shift 按钮文件中,您可以比较 URL,而无需转到存储库浏览器。
请参阅查看差异文档中的与另一个分支/标签的差异。
举例说明:
I don't know how new this feature is (I certainly read the documentation and didn't find it when I posted the question), but if you hold the Shift button down when you right click on a file, you can compare URLs without having to go to the repository browser.
See Difference to another branch/tag in the Viewing Differences documentation.
To illustrate:
我发现这种方法更容易:
打开要比较的文件的修订图表(
上下文菜单->TortoiseSVN->修订图表
)。选择第一个修订版,然后按住 Control 键单击以选择第二个修订版。现在右键单击选定的修订版本之一,然后从上下文菜单中选择比较修订版本
。在 TortoiseSVN 1.7.6 上测试。
I find this method to be much easier:
Open the revision graph for the file you want to diff (
context menu->TortoiseSVN->Revision Graph
). Select the first revision, and then control-click to select the second revision. Now right click on one of the selected revisions, and selectCompare Revisions
from the context menu.Tested on TortoiseSVN 1.7.6.
这里的答案很酷,我喜欢!就我而言,另一种很酷的方法是比较在 2 个不同文件夹中找到的 2 个不同文件:
第 1 步 - 右键单击,稍后进行比较< br>
步骤 2 - 右键单击,用“...”进行比较
就是这样! :)
The answers here are cool, i love it! Another cool way to diff, in my case, 2 different files found in 2 different folders:
Step 1 - Right-click, Diff later
Step 2 - Right-click, Diff with "..."
That's it! :)