是否可以在 CVS 中使用不同的 diff 程序? 我想使用像 meld 这样的东西来为我提供存储库和我的更改的并排图形视图。 使用不同的 CMS 是我无法控制的。 理想的是一些未记录的命令行参数,其工作方式如下:
cvs diff -prog /usr/bin/meld foo.cc
这将为我提供我签出的、修改后的 foo.cc 版本与存储库版本的差异,但使用 diff 程序融合。
我意识到没有记录的命令行参数不太可能,所以如果你必须将它组合在一起,这对我有用。
Is it possible to use a different diff program with CVS? I'd like to use something like meld to give me a side-by-side graphical view of the repository and my changes. It's out of my control to use a different CMS. What would be ideal is some undocumented command line argument that would work like this:
cvs diff -prog /usr/bin/meld foo.cc
This would give me a diff of my checked out, modified version of foo.cc with the repository version, but using the diff program meld.
I realize an undocumented command line argument is unlikely, so if you have to hack it together, that works for me.
发布评论
评论(4)
我使用 tkcvs 和 tkdiff (也不是最新版本)
最酷的是 tkcvs 还支持 subversion。
tkdiff 在命令行上工作并接受 cvs 标签...
I use tkcvs and tkdiff (not the lastest version either)
the cool thing is that tkcvs also supports subversion.
tkdiff works on the command line and takes cvs tags...
如果您使用 WinCVS,您可以设置一个 Diff 应用程序,例如 WinMerge 在首选项中。
在 WinCVS 首选项中,选项卡 WinCVS、“外部差异程序”
If you use WinCVS, you can setup a Diff application such as WinMerge in the preferences.
In WinCVS preferences, tab WinCVS, "External diff program"
我终于找到了 Vim 的 cvsmenu 插件。 它对我来说就像一种魅力。
I finally found the cvsmenu plugin for Vim. It works like a charm for me.
Meld 本身就支持这一点。 请参阅 屏幕截图,来自 meld.sourceforge.net
Meld supports this natively. See "Working Copy" screenshot from meld.sourceforge.net