[英]ClearTeam Explorer - CCRC - integrate with Beyond Compare
I am using IBM Rational Clear Case.我正在使用 IBM Rational Clear Case。 Due the current world wide health situation, I am forced to work from home.
由于当前世界范围内的健康状况,我被迫在家工作。
The best way and may be the only one, when using Visual Studio, is working with a Web View (Please correct me if there is a better way) - I assume this is called CCRC (Clear Case Remote Client).使用 Visual Studio 时,最好的方法也可能是唯一的方法是使用 Web 视图(如果有更好的方法,请纠正我) - 我假设这称为 CCRC(清除案例远程客户端)。 It is similar to a Snapshot View but without constant connection to the Clear Case server at work (This statement is not entirely correct).
它类似于快照视图,但在工作中没有与 Clear Case 服务器的持续连接(这种说法并不完全正确)。
When working with a snapshot view or for that matter with a dynamic view, I can change the setting to use Beyond Compare as the tool used for merge and compare in Clear Case.在使用快照视图或动态视图时,我可以更改设置以使用 Beyond Compare 作为用于在 Clear Case 中进行合并和比较的工具。
Now for my questions:现在我的问题:
1) Is there a way to do this also for ClearTeam Expolrer, which is where I control and manage my web view? 1) ClearTeam Expolrer 是否也有办法做到这一点,这是我控制和管理我的 web 视图的地方?
2) Any other workaround to use Beyond Compare with a web view? 2) 任何其他解决方法可以将 Beyond Compare 与 web 视图一起使用?
I found the answer on IBM support page: Changing the Diff/merge Type Manager in CCRC 7.1.1 and later .我在 IBM 支持页面上找到了答案: Changing the Diff/merge Type Manager in CCRC 7.1.1 and later 。 Where it is explained how to change this setting in the ClearTeam Explorer.
其中解释了如何在 ClearTeam Explorer 中更改此设置。
The description do not exactly match my version of Clear Case (9.0.1.07):描述与我的 Clear Case (9.0.1.07) 版本不完全匹配:
Should probably be:应该是:
In addition the following is probably valid for kdiff3.exe
:此外,以下内容可能对
kdiff3.exe
有效:
Choose 'Supports Compare Operations'
选择“支持比较操作”
Fill in the arguments for compare:
填写 arguments 进行比较:
%contribs% -fname "%filename1%" -fname "%filename2%"
Choose 'Supports Merge Operations'
选择“支持合并操作”
Fill in the arguments for merge:
%contribs% -o %merge_out%
填写 arguments 进行合并:
%contribs% -o %merge_out%
On Scooter Software site I actually found the correct arguments.在Scooter Software网站上,我实际上找到了正确的 arguments。
These are the modification for Beyond Compare:这些是 Beyond Compare 的修改:
Choose 'Supports Compare Operations'
选择“支持比较操作”
Fill in the arguments for compare:
填写 arguments 进行比较:
%contribs% /vcs1="%filename1%" /vcs2="%filename2%"
Choose 'Supports Merge Operations'
选择“支持合并操作”
Fill in the arguments for merge:
填写 arguments 进行合并:
%contrib1% %contrib2% %base% /mergeoutput="%merge_out%"
My Settings example:我的设置示例:
BComp.exe
and not BCompare.exe
.BComp.exe
而不是BCompare.exe
。 Because of that, I had a problem opening the compare more than once. And:和:
Doing the instruction recommended by IBM and Scooter Software did the trick and I could compare my code:执行IBM和Scooter Software推荐的指令就可以了,我可以比较我的代码:
Using a web view is a good option, unless you can use directly snapshot views, as I explained here (CC8+)使用web 视图是一个不错的选择,除非您可以直接使用快照视图,正如我在此处解释的(CC8+)
In both cases (web view or snapshot view), the goal is to have the files copied on your local disk, to avoid network latency.在这两种情况下(Web 视图或快照视图),目标都是将文件复制到本地磁盘上,以避免网络延迟。
The problem is: ClearTeam Explorer does not come with a mgrs/map
file to modify for you to declare your own diff tool (be it Beyond Compare or WinMerge)问题是:ClearTeam Explorer 没有附带要修改的
mgrs/map
文件,以便您声明自己的差异工具(无论是 Beyond Compare 还是 WinMerge)
So I used to get two web views:所以我曾经得到两个 web 视图:
That way, I could diff between the two separate view folders.这样,我可以区分两个单独的视图文件夹。
声明:本站的技术帖子网页,遵循CC BY-SA 4.0协议,如果您需要转载,请注明本站网址或者原文地址。任何问题请咨询:yoyou2525@163.com.