Combine tools that ignore $ Id strings

Question

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

Is there a merge tool that can be configured to ignore template-based string comparison results?

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

Francesco

Answer 1

meld, . , , CVS. , BTW, :

\$\w+(:[^\n$]+)?\$

linux : http://meld.sourceforge.net/ , Windos, , kdiff3 , : http://kdiff3.sourceforge.net/

Answer 2

cvs update -kk whick $words.

, $log, , .

Answer 3

CompareIT allows you to use a regular expression that matches. I used it to automatically generate code comparison, and it was very useful.