Show folder differences does not include equal files 4.2

If you are having a problem using SourceOffSite, post a message here.

Moderator: SourceGear

Post Reply
adiroot
Posts: 8
Joined: Sun Oct 11, 2009 8:48 pm

Show folder differences does not include equal files 4.2

Post by adiroot » Tue Nov 03, 2009 10:23 pm

The folder difference feature is not showing files that are equal in the remote and local directories. IT shows files that are different correctly. The behavior is not consistent across different folders. Some show correctly, some do not.

This feature used to work just fine until this morning. I use DiffMerge to view the folder differences. The DiffMerge Show Equal etc settings are correctly setup.

I cleared out my C:\Documents and Settings\User\Local Settings\Temp\ folder; it did not help.

Beth
Posts: 8550
Joined: Wed Jun 21, 2006 8:24 pm
Location: SourceGear
Contact:

Re: Show folder differences does not include equal files 4.2

Post by Beth » Wed Nov 04, 2009 4:45 pm

In the Diff/Merge Window, can you go to Help - About and look up the version you have of that utility?

After that, go to Tools - Options and take a screenshot of the first page and post it along with the version number.
Beth Kieler
SourceGear Technical Support

adiroot
Posts: 8
Joined: Sun Oct 11, 2009 8:48 pm

Re: Show folder differences does not include equal files 4.2

Post by adiroot » Wed Nov 04, 2009 8:36 pm

Version screenshots are attached. Please note that the feature used to work - no changes were made to my setup.

I just took a look at the contents of the Temp directories that SOS is passing to DiffMerge (C:\Documents and Settings\User\Local Settings\Temp\local440923 and remote092344. DiffMerge is correctly showing the folder differences. Only files that differ are in the directories.
Attachments
SoSClientOptionsGeneral.jpg
SoSClientOptionsGeneral.jpg (68.15 KiB) Viewed 13855 times
DiffMergeVer.jpg
DiffMergeVer.jpg (42.82 KiB) Viewed 13855 times

adiroot
Posts: 8
Joined: Sun Oct 11, 2009 8:48 pm

Re: Show folder differences does not include equal files 4.2

Post by adiroot » Wed Nov 04, 2009 8:38 pm

SOS Client version is 4.2
Attachments
SoSClientVersion.jpg
SoSClientVersion.jpg (107.26 KiB) Viewed 13855 times

Beth
Posts: 8550
Joined: Wed Jun 21, 2006 8:24 pm
Location: SourceGear
Contact:

Re: Show folder differences does not include equal files 4.2

Post by Beth » Thu Nov 05, 2009 1:11 pm

Sorry about the confusion. I need you to go to Tools - Options in the Diff - Merge window. I get the same results as you, but I have the "Hide identical Files" checked. I have a screenshot of mine posted.
Attachments
diff merge.JPG
diff merge.JPG (26.17 KiB) Viewed 13852 times
Beth Kieler
SourceGear Technical Support

adiroot
Posts: 8
Joined: Sun Oct 11, 2009 8:48 pm

Re: Show folder differences does not include equal files 4.2

Post by adiroot » Thu Nov 05, 2009 9:09 pm

We have different version of DiffMerge.

Please remember, this feature used to work - I did not make any changes and I am well aware of how to use DiffMerge to show equivalent files. Also please re-read my post about the content of the temp folders.

I'm attaching screens of what DiffMerge looks like when doing the folder comparison along with what the SOS client shows. Please note how DiffMerge shows the 'select equivalent files' icon is selected.

Here is a screen of a comparison between two local folders (SOS not used) demonstrating that showing equivalent files does work in DiffMerge.
Attachments
DiffMergeWorks.jpg
Here is a screen of a comparison between two local folders (SOS not used) demonstrating that showing equivalent files does work in DiffMerge.
DiffMergeWorks.jpg (293.17 KiB) Viewed 13850 times
SOSClient.jpg
This is the folder I want to see the differences for.
SOSClient.jpg (131.13 KiB) Viewed 13850 times
DiffMerge.jpg
This is what DiffMerge looks like when doing the folder comparison when launched from the SOS client.
DiffMerge.jpg (202.58 KiB) Viewed 13850 times
DiffOptions.jpg
We have different version of DiffMerge - these are the options I see.
DiffOptions.jpg (121.04 KiB) Viewed 13850 times

Beth
Posts: 8550
Joined: Wed Jun 21, 2006 8:24 pm
Location: SourceGear
Contact:

Re: Show folder differences does not include equal files 4.2

Post by Beth » Tue Nov 17, 2009 1:34 pm

In your Options, under Folder Windows, what do you have set for Equivalence Mode?

With your diff Window open, can you find the version number of the diff tool you are using under the Help - About?
Beth Kieler
SourceGear Technical Support

Beth
Posts: 8550
Joined: Wed Jun 21, 2006 8:24 pm
Location: SourceGear
Contact:

Re: Show folder differences does not include equal files 4.2

Post by Beth » Thu Nov 19, 2009 9:25 am

I think I see now what's happening. This looks like the Diff/Merge tool that can be downloaded separately.

Go to your View menu and select the option to show equal files.
Beth Kieler
SourceGear Technical Support

adiroot
Posts: 8
Joined: Sun Oct 11, 2009 8:48 pm

Re: Show folder differences does not include equal files 4.2

Post by adiroot » Sun Nov 22, 2009 8:37 pm

adiroot wrote:I'm attaching screens of what DiffMerge looks like when doing the folder comparison along with what the SOS client shows. Please note how DiffMerge shows the 'select equivalent files' icon is selected.
Beth wrote:I think I see now what's happening. This looks like the Diff/Merge tool that can be downloaded separately.

Go to your View menu and select the option to show equal files.
How about reading the posts before replying?

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

Re: Show folder differences does not include equal files 4.2

Post by jeffhostetler » Tue Nov 24, 2009 9:58 am

Hello, let me jump in here and ask a few questions.

It's odd that you'd see different results -- unless when SOS
is fetching a temp copy of the remote files (to give to DiffMerge)
it is not expanding any of the $Id:$ tokens or dealing with any
EOL conversions necessary or something similar....

[] when looking at the local-vs-remote folder window where
the *.h and *.cpp appear to be different. what happens
when you double click on one of them? That is, when the
2 files open in a file window are they actually different?,
identical?, or identical-under-this-ruleset?

if you turn on the show-invisibles, do you see any differences
in the EOL characters?

Is the correct Ruleset displayed in the status bar at the bottom of
the window?

[] in the DiffMerge Options dialog, Equivalence Mode page, what
settings do you have?

[] I'm also wondering why we're talking about "Equivalence"
here. "Equivalent (but not Equal)" files will be shown with
a "congruence" icon rather than an "equal sign" icon and I'm
not seeing that in any of the screen shots.

[] I'm also wondering how you're getting both relative and absolute
pathnames in the folder window. The entries for each row should
be relative pathnames -- relative to the directory in the column
heading. But you've got some D:\... and a ..\Output\... pathnames
in there somehow.

I find it rather odd that a "file" within "C:\Documents...." could have
a filename of "D:\Bubbler....".

While you have the local-vs-remote folder window open, try opening
both folders using Windows Explorer and see if they have anything
different from what DiffMerge is showing.

jeff

adiroot
Posts: 8
Joined: Sun Oct 11, 2009 8:48 pm

Re: Show folder differences does not include equal files 4.2

Post by adiroot » Tue Nov 24, 2009 9:16 pm

Hi Jeff, thanks for helping out
jeffhostetler wrote: [] when looking at the local-vs-remote folder window where
the *.h and *.cpp appear to be different. what happens
when you double click on one of them? That is, when the
2 files open in a file window are they actually different?,
identical?, or identical-under-this-ruleset?
They are actually different. Different files are correctly shown as being different.

Everything works except identical files are not shown.
jeffhostetler wrote: if you turn on the show-invisibles, do you see any differences
in the EOL characters?
Both files show 0x0D 0x0A as EOL
jeffhostetler wrote: Is the correct Ruleset displayed in the status bar at the bottom of
the window?
Not sure what you mean. The status bar in DiffMerge shows "0 Identical/21 Different/7 files without Peers/2 Folders" all of which is correct for the contents of the directories being compared.
jeffhostetler wrote: [] in the DiffMerge Options dialog, Equivalence Mode page, what
settings do you have?
"Disable File Equivalence Testing -- Use Exact Match Only"
jeffhostetler wrote: [] I'm also wondering why we're talking about "Equivalence"
here. "Equivalent (but not Equal)" files will be shown with
a "congruence" icon rather than an "equal sign" icon and I'm
not seeing that in any of the screen shots.
Not sure what you mean. My problem is that files that are identical (equal) are not showing up. They are not present in the temp folders created by SOS.
jeffhostetler wrote: [] I'm also wondering how you're getting both relative and absolute
pathnames in the folder window. The entries for each row should
be relative pathnames -- relative to the directory in the column
heading. But you've got some D:\... and a ..\Output\... pathnames
in there somehow.

I find it rather odd that a "file" within "C:\Documents...." could have
a filename of "D:\Bubbler....".
The files with the full pathname are windows shortcuts.
jeffhostetler wrote: While you have the local-vs-remote folder window open, try opening
both folders using Windows Explorer and see if they have anything
different from what DiffMerge is showing.
I've done that. Identical (equal) files are not present in the temp folders created by SOS. The problem is not with the comparison utility but with SOS populating the temp directories.

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

Re: Show folder differences does not include equal files 4.2

Post by jeffhostetler » Wed Nov 25, 2009 8:24 am

Thanks for your responses and your patience here. I think I understand.

Let me try to paraphrase:
When SOS 4.2 does a folder difference and launches DiffMerge
(in this case DiffMerge 3.3.0, but that doesn't matter), SOS is
not putting the identical files into the temp directories
created for the hand-off to DiffMerge; it is only putting the
files that are different. Furthermore, this behavior is not
consistent -- there are times/directories for which SOS does
put the identical files and times/directories for which it does
not. DiffMerge is correctly showing the differences based upon
what it is given (the 2 temp directories created by SOS); but
because SOS isn't always creating the full view, the DiffMerge
window looks like it is filtering/hiding things.

Now that we understand what's happening, let us take a look
at the problem. Beth has successfully duplicated the problem
on her test machine, so hopefully we'll have an answer shortly.


Thanks again for your patience here.
jeff

Beth
Posts: 8550
Joined: Wed Jun 21, 2006 8:24 pm
Location: SourceGear
Contact:

Re: Show folder differences does not include equal files 4.2

Post by Beth » Mon Nov 30, 2009 2:11 pm

We've discussed this issue and it appears that not copying identical files to temporary directories was an optimization made for large diffs. If you had to diff 20 GB, you would have to wait for both a copy of 20 GB and a Get from SOS of 20 GB.

What I can do is take a feature request to find some way to show the identical files using the Diff/Merge tool with SOS.
Beth Kieler
SourceGear Technical Support

Post Reply