First of all, a thank you to SourceGear for providing DiffMerge free of charge. Great program and I personally appreciate it!
I have a question about the Folder Diff window. Please excuse me if this was answered elsewhere - I was unable to find it in my searching.
I am currently attempting to compare Classic ASP files from differing versions. I don't appear to be able to get them to compare properly in the Folder Diff window - although they are properly identified as Equivalent once you get to the 'File Diff' level. I suspect I'm missing something in the configuration although I can't image what that might be.
A great many of the files only appear to differ in the version number contained on comment lines. (In ASP, comment lines begin with an apostrophe and my understanding it that the regex expression ^'.*$ should work in the 'Lines to Omit' section of the ruleset.)
What I did to test was copy a 'faq.asp' file from one directory I was comparing to another. At that point, they show up as equal. Opening one of the files (with notepad) and adding anything in the comment area (which should be ignored) results in the file being 'not equal' rather than 'equivalent'. I've performed this test on 32-bit XP & 64-bit Windows 7 machines with the same result. I also created a '.asp' file in each directory with the following four lines:
'
' v3.4.06x
'
xxx
In the copied file, I removed the 'x'. Same results (not equal rather than equivalent).
Tools --> Options --> Folder Windows --> Equivalence Mode --> 'Exact match or Ruleset-based File Equivalence Testing' is checked.
What am I missing? Shouldn't this work?
Here's the information from the Ruleset I created:
Code: Select all
Ruleset: Active Server Pages (ASP)
Suffixes: asp
Line Match Handling: [0x00000010]
Ignore/Strip EOLs: true
Ignore/Fold Case: true
Strip Whitespace: true
Also Treat TABs as Whitespace: true
Folder Diff Ruleset Equivalence: [0x00000010]
Ignore/Strip EOLs: true
Ignore/Fold Case: true
Strip Whitespace: true
Also Treat TABs as Whitespace: true
Default Context Guidelines: [0x00000012]
Classify Differences as Important: true
EOL differences are important: N/A
Case differences are important: false
Whitespace differences are important: false
Treat TABs as Whitespace: true
Custom Contexts: [0 contexts]
Character Encoding:
Automatically detect Unicode BOM: true
Fallback Handling: Use System Local/Default
Lines To Omit: [2 patterns]
LOmit[0]: Each Line Matching: ^[[:blank:]]*$
LOmit[1]: Each Line Matching: ^'.*$
Code: Select all
Active Window Properties:
Window Title: _TestAspDoc.asp - SourceGear DiffMerge
Window Type: FileDiff
Edit State: Editable
DisplayOps[View]: 0x00000010
DisplayOps[Edit]: 0x00000010
Pilcrow: false
TabStop: 8
LineNumbers: true
Files Loaded:
Panel(Left):
Path: C:\Data\Downloads\Snitz\_UpgradeFiles\sf2k_v34_06\_TestAspDoc.asp
EOL Style: CRLF
Encoding: Default encoding (without BOM)
Stats: [0x00000000]
Panel(Right/View):
Path: C:\Data\Downloads\Snitz\_UpgradeFiles\sf2k_v34_07\_TestAspDoc.asp
EOL Style: CRLF
Encoding: Default encoding (without BOM)
Stats: [0x00000000]
Panel(Right/Edit):
Path: C:\Data\Downloads\Snitz\_UpgradeFiles\sf2k_v34_07\___9E8E.tmp
EOL Style: CRLF
Encoding: Default encoding (without BOM)
Stats: [0x00000000]
RuleSet: Active Server Pages (ASP)
Analysis Reference View:
DisplayOps: 0x00000010
Analysis Stats: Changes: 0; Omissions: 1
Alignment Marks: [count 1]
Analysis Editing View:
DisplayOps: 0x00000010
Analysis Stats: Changes: 0; Omissions: 1
Alignment Marks: [count 1]
Code: Select all
SourceGear DiffMerge : Version 3.3.0 (18513) : WXMSW {2.8.7}