prcaen
prcaen

Reputation: 2489

Diff merge : view difference between two folders and ignore file version number

I need some help. I have to view difference between two folders, but I need to ignore the file version number (project version number) which is in the header of the file. Like that:

@version Release: $Revision: 9939 $

And do you know the best diff merge software for doing that in Mac OSX and the most beautiful. I know diff merge and Kaleidoscope. I love Kaleidoscope but, it cannot make some difference between two folders.

Many thanks before.

Upvotes: 2

Views: 4137

Answers (1)

skelly
skelly

Reputation: 668

Try going into DiffMergePreferencesFile WindowsRulesets. You can modify the existing ruleset for your file type (or add a new one if no ruleset exists already).

Edit the ruleset you're interested in, and go to Lines to Omit. In there you can add a regex to match that line @version.

What I'm having trouble with is getting the folder diff to honor this. I find that files with no diffs according to my rules still end up in the folder diff as a non-match, but when I open the file diff window it says Files are identical or equivalent under the current RuleSet. Not sure if this is a bug or I still have something configured wrong. If I go into Folder WindowsEquivalence Mode and dig into the help there, I think I have all the folder diff properties set correctly to honor my rulesets, but still no luck.

Upvotes: 4

Related Questions