Folder compare ignores ruleset

Support for our DiffMerge utility.

Moderator: SourceGear


Posts: 1
Joined: Mon Oct 08, 2007 7:01 am
PostPosted: Mon Oct 08, 2007 7:04 am
We use Vault keywords in the header of our source code. We edited the C/C++/C# ruleset to omit lines with the keywords that we use. However, when we compare directories, files that are identical but for keyword contents (eg $Header: contains a different path) are still flagged as different.

When we double-click on a file, the diff confirms that the $Header: line is omitted (it's greyed out) and that there are no other differences between the files.

It makes comparing directories very difficult to do!

Posts: 534
Joined: Tue Jun 05, 2007 11:37 am
Location: SourceGear
PostPosted: Mon Oct 08, 2007 8:29 am
<p>Sorry, but this is by design.
<p>FolderDiff doesn't run the full diff-engine when scanning directories.
It does a straight memcpy on each pair of files and stops as soon as it
finds a difference. This was done for speed. FolderDiff would be even
slower if it ran everythign thru the full diff-engine.
<p>There are problems with this approach -- as you point out and for
stuff like EOL chars -- where it'd be nice if it did it the other way.
<p>I'll put in a request to make this an option.

Posts: 3
Joined: Wed Nov 07, 2007 4:28 pm
PostPosted: Wed Nov 07, 2007 4:33 pm
I would like to second a request for this feature, even if it is offered as an additional step that I need to initiate after DiffMerge has identified the files that differ regardless of ruleset.

-Kevin

Posts: 1
Joined: Wed Mar 26, 2008 1:42 pm
PostPosted: Wed Mar 26, 2008 1:46 pm
I too would like to request this feature. I would suggest an option for FolderDiff to run the full diff-engine or do the current simple memcmp behavior.

Otherwise a great tool.

Thanks,
Ron.

Posts: 1
Joined: Wed Apr 23, 2008 2:46 am
PostPosted: Wed Apr 23, 2008 2:49 am
I would like to second a request for this feature too.

Thanks.

Posts: 1
Joined: Tue Jul 01, 2008 4:32 pm
PostPosted: Tue Jul 01, 2008 4:34 pm
Another request here, although I think the feature should be implemented as optional, and it should only do the full diff-engine on files that have already been flagged as different by the memcpy (that should have be a given but I'd just like to state it to be sure)

Posts: 534
Joined: Tue Jun 05, 2007 11:37 am
Location: SourceGear
PostPosted: Wed Jul 02, 2008 6:40 am
Yes, good points. I'll add them (and your vote) to the feature request.

j

Posts: 534
Joined: Tue Jun 05, 2007 11:37 am
Location: SourceGear
PostPosted: Thu Feb 12, 2009 9:01 am
I have a pre-release of DiffMerge 3.3.0 available that addresses the problems
described in this thread. This version optionally uses Ruleset settings in the
folder window to ignore minor differences and show pairs of files as "equivalent".

If you'd like to give it a try, send a note to support at sourcegear.com (attn Jeff
Hostetler) and I'll send you download instructions.

Cheers,
jeff

Posts: 534
Joined: Tue Jun 05, 2007 11:37 am
Location: SourceGear
PostPosted: Thu Apr 09, 2009 9:26 am
SourceGear DiffMerge 3.3.0 is now available and addresses this problem.
We can now use some of the Ruleset settings to treat minor differences as equivalent.

Full details can be found at http://www.sourcegear.com/diffmerge/index.html.

jeff hostetler

Posts: 2
Joined: Thu Feb 04, 2010 1:30 am
PostPosted: Thu Feb 04, 2010 1:37 am
I'm using 3.3 version on Mac OS X. Everything works fine, except in folder view diff not using "Lines to Omit" from ruleset.

In options Folder Equivalence Mode is set to "Exact Match or Ruleset-based File Equivalence Testing".
In folder view files are marked as different. But, then I click go to file view, I get "Files are Identical" message. What is wrong ?

Posts: 534
Joined: Tue Jun 05, 2007 11:37 am
Location: SourceGear
PostPosted: Mon Feb 08, 2010 11:51 am
I've identified a problem in 3.3.0 with "Lines to Omit" and "Folder Window Equivalence"
that is caused by multiple, consecutive omit-able lines. The first line in a block of
omit-able lines is correctly ignored; subsequent ones are not. When there are
changes on the subsequent lines, it causes the Folder Window to say that they are
different rather than equivalent; but then when you open them in a File Window,
you get the equivalent message.

Does this match the problem you are seeing?

jeff

viewtopic.php?f=33&t=12923

Posts: 2
Joined: Thu Feb 04, 2010 1:30 am
PostPosted: Tue Feb 09, 2010 1:45 am
jeffhostetler wrote:I've identified a problem in 3.3.0 with "Lines to Omit" and "Folder Window Equivalence"
that is caused by multiple, consecutive omit-able lines. The first line in a block of
omit-able lines is correctly ignored; subsequent ones are not. When there are
changes on the subsequent lines, it causes the Folder Window to say that they are
different rather than equivalent; but then when you open them in a File Window,
you get the equivalent message.

Does this match the problem you are seeing?

jeff

viewtopic.php?f=33&t=12923


Yes, now I see, it's the same problem.

Posts: 534
Joined: Tue Jun 05, 2007 11:37 am
Location: SourceGear
PostPosted: Tue Feb 09, 2010 7:14 am
OK. Thanks. I'll add your post to the log for this bug.

thanks
jeff

15146

Posts: 1
Joined: Tue Aug 03, 2010 4:45 pm
PostPosted: Tue Aug 03, 2010 5:03 pm
Hi,
Thanks for the great program, I find it really useful.
I'm having a problem with the Ruleset-based File Equivalence. It works when I tick the box and click OK, but even though the tickbox state is saved the setting isn't applied the next time.
This means that each time I want to do a folder diff I have to go into settings, untick the selection, click OK, go back into settings and re-tick the selection and click OK.

Posts: 534
Joined: Tue Jun 05, 2007 11:37 am
Location: SourceGear
PostPosted: Mon Aug 09, 2010 7:38 am
That's odd.

What platform are you using?

If you turn it on and save and then exit and re-launch is it still turned on?

jeff
Next

Return to Support (DiffMerge)

Who is online

Users browsing this forum: No registered users and 1 guest

cron