合并工具，忽略$ Id行 [英] Merge tools that ignores $Id lines

问题描述

我需要合并一个分叉的项目. 不幸的是，CVS的$ Id行是不同的，因此我尝试过的合并工具报告所有文件都是不同的(其中95％的文件只有这一行是不同的)

I need to merge a forked project. Unfortunately, the CVS $Id lines are different so the merge tools I tried report that all the files are different (and 95% of them have only this line different)

是否存在可以配置为基于模式忽略行比较结果的合并工具?

Is there a merge tool that can be configured to ignore line comparison results based on a pattern ?

我发现WinMerge具有行过滤器-正确设置它们实际上是可行的.

[edit] I discovered that WinMerge has line filters - setting up them correctly actually works.

弗朗切斯科

推荐答案

好，您可以使用 cvs更新-kk whick不会扩展$ words.

well you could use cvs update -kk whick does not expand the $words.

当然，在提交时扩展$ log而不是更新$ log仍然是一个问题.

of course this is still a problems the $log which is expanded on commits and not updates.

这篇关于合并工具，忽略$ Id行的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！