我可以使用 subversion 和 Beyond Compare 一次比较多个文件吗?

发布于 2024-10-20 07:57:50 字数 445 浏览 6 评论 0原文

所以,我已经成功地弄清楚了如何使用 Windows 7 通过命令行 subversion 和 Beyond Compare 3 进行简单的比较和 3 路合并。谢谢你,stackoverflow。

然而,我经常在提交之间更改许多文件,即 html 文件、css 文件和 javascript 文件,所有这些文件都与相同的错误修复相关。当我使用内置的 svn diff 时,我只需输入“svn di”,它就会显示所有文件中所有差异的列表。有没有办法使用 Beyond Compare 3 触发此类功能?

目前,当我输入“svn di”时,它会将第一个文件发送到Beyond Compare,当我检查完更改后,我关闭Beyond Compare窗口,差异结束。如果不手动输入每个名称,我就无法区分其他文件。 (有时我记不起我改变过的所有内容......基本上,它变得非常混乱。)

这可能吗?如果是这样,怎么办?

谢谢。

So, I've successfully figured out how to do a simple diff and a 3 way merge with command-line subversion and Beyond Compare 3 using Windows 7. Thank you, stackoverflow.

However, I frequently have lots of files that I change in between commits, i.e. an html file, css file and javascript file all related to the same bug fix. When I'm using the built in svn diff, I can just type "svn di" and it will show me a list of all the diffs in all the files. Is there a way to trigger this type of functionality with Beyond Compare 3?

At the moment, when I type "svn di", it will send the first file to Beyond Compare, and when I'm done reviewing the changes, I close the beyond compare window, and the diff ends. There's no way for me to diff the other files without typing in each name manually. (And sometimes I can't remember all the ones I've changed... basically, it gets really messy.)

Is this even possible? If so, how?

Thanks.

如果你对这篇内容有疑问,欢迎到本站社区发帖提问 参与讨论,获取更多帮助,或者扫码二维码加入 Web 技术交流群。

扫码二维码加入Web技术交流群

发布评论

需要 登录 才能够评论, 你可以免费 注册 一个本站的账号。

评论(2

半山落雨半山空 2024-10-27 07:57:50

也许不是您想要的,但与 Beyond Compare 3 集成的 TortoiseSVN 对于此类操作来说是一种享受。 svn 更新后我的工作流程通常是:

  1. TortoiseSVN >检查修改|提交
  2. 通过双击/与基础版本比较(与 BC3 集成)
  3. 根据 BC3 中显示的 diff 输出更新 svn 日志。

这可能适合您的任务的原因是您可以选择所有修改的文件(Ctrl+A),然后双击/与基础文件进行比较,BC3 将在单独的选项卡中立即加载所有差异。

您也可以通过命令行< /a>(未经测试)。

Perhaps not what you're looking, but TortoiseSVN integrated with Beyond Compare 3 works a treat for this sort of operation. My workflow after an svn update is typically:

  1. TortoiseSVN > Check For Modifications | Commit
  2. Review each modification by double-click/compare with base (integrated with BC3)
  3. Update svn log based on diff output shown in BC3.

The reason why this may suit your task is that you can select all modified files (Ctrl+A), then double-click/compare with base, and BC3 will load up all the diffs at once in separate tabs.

You might also be able to achieve this from the command line (untested).

冰之心 2024-10-27 07:57:50

我对 Beyond Compare 的接触只是通过同事的使用(所以我不太了解),但你可能想尝试 KDiff3 比较工具(免费,GPL)非常出色。除了

My exposioure to Beyond Compare has only been through collueages' use (so I do not know it very well), but you might want to try the KDiff3 comparision tool instead (free, GPL) which is really excellent. I am not aware of any svn integration problems other than the wrapper issue mentioned here.

~没有更多了~
我们使用 Cookies 和其他技术来定制您的体验包括您的登录状态等。通过阅读我们的 隐私政策 了解更多相关信息。 单击 接受 或继续使用网站,即表示您同意使用 Cookies 和您的相关数据。
原文