Folder Diff Equivalencies

Support for our DiffMerge utility.

Moderator: SourceGear

Post Reply
bricklin1155
Posts: 3
Joined: Sat Dec 19, 2009 5:27 am
Contact:

Folder Diff Equivalencies

Post by bricklin1155 » Sat Dec 19, 2009 6:32 am

Greets all!

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: ^'.*$
Here's information from one of the test files:

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]
Version number:

Code: Select all

SourceGear DiffMerge : Version 3.3.0 (18513)  : WXMSW {2.8.7}

jeffhostetler
Posts: 534
Joined: Tue Jun 05, 2007 11:37 am
Location: SourceGear
Contact:

Re: Folder Diff Equivalencies

Post by jeffhostetler » Mon Dec 21, 2009 9:09 pm

Yeah, that is a bug. The problem is the multiple ignored lines all clumped together
there. If the version string were in the first comment line and the following lines
were equal, then the equivalance stuff would work. But the initial comment line
gets the parser out-of-sync.

So, for example if the file were

Code: Select all

Hello World!
'Version 1.2.3
Hello again!
and the other version had the "x" appended, it should show up as equivalent
in the folder window.

I'll log this and have a fix in the next release.

And FWIW, yeah ^'.*$ works, but ^' would also work.

Sorry,
jeff

15146

bricklin1155
Posts: 3
Joined: Sat Dec 19, 2009 5:27 am
Contact:

Re: Folder Diff Equivalencies

Post by bricklin1155 » Tue Dec 22, 2009 4:23 am

Jeff

Thank you for the fast response.

No apology needed, either. Even with this (minor) defect, your program is going to make an upgrade to my forum possible.

Any thoughts on the timeframe for the next release? (When should I check back?)

jeffhostetler
Posts: 534
Joined: Tue Jun 05, 2007 11:37 am
Location: SourceGear
Contact:

Re: Folder Diff Equivalencies

Post by jeffhostetler » Tue Dec 22, 2009 7:00 am

Thanks.

I don't have a date for the next release yet. It'll probably be late Q1 / early Q2,
but that's just a guess. I have to thread it in between other product releases and
steal some QA time and etc....

As for checking back. I'll post a follow-up on this thread when I make a release
that fixes this bug. So, if your forum settings cause you to receive a thread-update
email, you should get a notification automatically (granted, it'll just say that a
thread that you commented on has been updated).

Cheers,
jeff

bricklin1155
Posts: 3
Joined: Sat Dec 19, 2009 5:27 am
Contact:

Re: Folder Diff Equivalencies

Post by bricklin1155 » Wed Dec 23, 2009 6:03 am

Once again ... thanks Jeff. Will watch for it!!

piedmont
Posts: 5
Joined: Wed Jan 16, 2013 11:29 am

Re: Folder Diff Equivalencies

Post by piedmont » Wed Jan 16, 2013 11:40 am

Hi Jeff

Thank you for making such a beautiful tool available for free...

I believe I'm experiencing this same issue as the previous questioner:

Using rulesets, some 'equivalent' files are appearing as different in the folder comparison window. It seems to hinge on whether there are consecutive 'omitted' lines.

Is this expected - i.e. is the issue unresolved?

Diffmerge Version 3.3.2 (1139) [x64]

jeffhostetler
Posts: 534
Joined: Tue Jun 05, 2007 11:37 am
Location: SourceGear
Contact:

Re: Folder Diff Equivalencies

Post by jeffhostetler » Tue Jan 22, 2013 6:42 am

Sorry, but this bug has not yet been fixed.
Unfortunately, I don't have an ETA for it that I can give you.

Sorry,
j

Post Reply