SlickEdit Community

Archived Beta Discussions => SlickEdit 201x Beta Discussions => SlickEdit 2018 v23 Beta Discussion => Topic started by: PiezonTM on October 09, 2018, 01:09:50 PM

Title: B6: Diff Not Detecting Changes
Post by: PiezonTM on October 09, 2018, 01:09:50 PM

I am using SE diff as my git difftool and when I diff the file it pops up and says no changes.  I select "Yes" that I would like to view the file anyways--because I know there ARE changes.  The attached screenshot clearly shows my changes but they are not marked different (I marked the diff on the right).  I have seen this a couple times.  This file is 100% reproducible.  Other files in the "git difftool" call are diffed correctly.

I am running Ubuntu 16.04, SE B6.  My .gitconfig is:

Code: [Select]

[diff]
    tool=vsdiff

[difftool "vsdiff"]
    cmd = /home/username/slickedit-pro2018beta6/bin/vsdiff "-r1" "$LOCAL" "$REMOTE"


Title: Re: B6: Diff Not Detecting Changes
Post by: Dan on October 09, 2018, 01:12:12 PM

Is this being launched from multi-file diff?

Title: Re: B6: Diff Not Detecting Changes
Post by: PiezonTM on October 09, 2018, 01:17:58 PM

No, this is being started from "git difftool".

Title: Re: B6: Diff Not Detecting Changes
Post by: Dan on October 09, 2018, 01:21:21 PM

Hm, Ok, I'll set that up.  In the meantime, can you try diffing the two files from in SlickEdit and see what happens?  It works OK for me.  I'm wondering if it's because I don't have the whole files, but typed the snippets in verbatim.

Title: Re: B6: Diff Not Detecting Changes
Post by: PiezonTM on October 09, 2018, 01:35:29 PM

My "git difftool" has 4 files that differ, and this is the only one that was showing this problem.

Title: Re: B6: Diff Not Detecting Changes
Post by: Dan on October 09, 2018, 03:48:12 PM

Ok, I'll set that up.  In the meantime, can you try diffing the two files from in SlickEdit and see what happens?  It works for me.

Title: Re: B6: Diff Not Detecting Changes
Post by: PiezonTM on October 09, 2018, 04:53:05 PM

Appears to do the same thing in the SE diff.

Title: Re: B6: Diff Not Detecting Changes
Post by: Dan on October 09, 2018, 04:54:38 PM

Any chance you can send me the whole files?   I typed in the snippets you gave me and it detected the differences.

What are your diff options set to?

Title: Re: B6: Diff Not Detecting Changes
Post by: PiezonTM on October 09, 2018, 05:58:31 PM

I'd prefer not post the code (work related), but could email it if that is fine.  Also, I try the same file and it is not happening.  Yet I did see it on a different file in a different repo and the problem happened.  I have now tried both files and neither are currently showing this problem.  Seems to come and go.

Title: Re: B6: Diff Not Detecting Changes
Post by: Dan on October 09, 2018, 05:59:40 PM

I will PM you an email address.

Title: Re: B6: Diff Not Detecting Changes
Post by: PiezonTM on October 09, 2018, 06:05:30 PM

See attachments for my settings.

Title: Re: B6: Diff Not Detecting Changes
Post by: Dan on October 09, 2018, 06:18:34 PM

Is the top one vsdiff, and the bottom one the options in SlickEdit?

Title: Re: B6: Diff Not Detecting Changes
Post by: PiezonTM on October 09, 2018, 06:22:20 PM

They are both from the settings when I open from SE.  I see no options from the diff when run from the command line using "git difftool".

Title: Re: B6: Diff Not Detecting Changes
Post by: Dan on October 09, 2018, 06:23:57 PM

Sorry, I missed that it was for the two different tree settings.

Title: Re: B6: Diff Not Detecting Changes
Post by: PiezonTM on October 09, 2018, 09:01:17 PM

I just had the problem happen again. I sent my files to you in email (my file and the temp git file).

As a side note, since I had the problem, I did a "git add/git commit/git push".  Afterwards I modified this file again and did another "git difftool" and the problem still exists.  So it seems that the "git temp" file may not be the problem since it creates a new temp file each time.

Title: Re: B6: Diff Not Detecting Changes
Post by: Dan on October 11, 2018, 05:35:12 PM

Fixed for RC1.