Author Topic: vsdiff broken  (Read 1698 times)

lwaynej

  • Community Member
  • Posts: 75
  • Hero Points: 1
vsdiff broken
« on: September 11, 2018, 06:17:39 pm »
diff is broken. I don't have time to figure out the exact details but it is showing invalid diffs.

in the case I am looking at the "No more differences. Close now?" has popped up but there is a diff showing. If I cancel I cannot doing anything with the line. The diff is bogus.

On the left hand side I have

void a()...
void a()...//vsdiff has duplicated this line.
void b()...

and on the right I have
void a()...
void b()...

I am currently merging files from Windows to Linux so there may be line ending differences. I don't know if that is relevant. Unfortunately, I cannot use vsdiff because of this so I can't do any more investigation at work. I will try and carve out some time at home to look into this.

lwaynej

  • Community Member
  • Posts: 75
  • Hero Points: 1
Re: vsdiff broken
« Reply #1 on: September 11, 2018, 06:18:23 pm »
SlickEdit Pro 2018 (v23.0.0.5 64-bit)

Serial number: FE11874_BETA
License type: Beta License
License expiration: 2018-10-09 17:00:00
License file: C:\ProgramData\slickedit\23\slickedit.lic

Build Date: September 06, 2018
Emulation: CUA

OS: Windows 7 x64
OS Version: 6.01.7601  Service Pack 1
Memory: 62% Load, 4932MB/7888MB Physical, 7056MB/15774MB Page File, 557MB/8388607MB Virtual
Shell Information: C:\windows\system32\cmd.exe /q
Screen Size: 1920 x 1050, 1920 x 1080

Project Type: Cpp
Language: .h (C/C++)
Encoding: Automatic

Installation Directory: C:\Program Files\SlickEdit Pro 23.0.0 Beta4\ (non-removable drive,NTFS,44156MB free)
Configuration Directory: C:\Users\WJohnson\Documents\My SlickEdit Config\23.0.0\ (non-removable drive,NTFS,44156MB free)
Migrated from: C:\Users\WJohnson\Documents\My SlickEdit Config\22.0.2\
Spill File: C:\Users\WJohnson\AppData\Local\Temp\$slk.6072 (non-removable drive,NTFS,44156MB free)


Dan

  • SlickEdit Team Member
  • Senior Community Member
  • *
  • Posts: 2286
  • Hero Points: 128
Re: vsdiff broken
« Reply #2 on: September 11, 2018, 06:21:18 pm »
I will look into this, I fixed a case like this for beta 4.

Dan

  • SlickEdit Team Member
  • Senior Community Member
  • *
  • Posts: 2286
  • Hero Points: 128
Re: vsdiff broken
« Reply #3 on: September 11, 2018, 10:45:02 pm »
I wasn't able to reproduce this with the current build.  Are you sure you ran it in beta 4?  That's what your information seems to indicate. 

lwaynej

  • Community Member
  • Posts: 75
  • Hero Points: 1
Re: vsdiff broken
« Reply #4 on: September 12, 2018, 03:19:39 pm »
I am sure it is beta 4.

I am merging between Linux and Windows. There could be line ending differences. If I have time to try the beta again I check if this is the case.

Dan

  • SlickEdit Team Member
  • Senior Community Member
  • *
  • Posts: 2286
  • Hero Points: 128
Re: vsdiff broken
« Reply #5 on: September 12, 2018, 04:25:23 pm »
I tried line ending differences and haven't seen it yet.  I'll keep trying.

Dan

  • SlickEdit Team Member
  • Senior Community Member
  • *
  • Posts: 2286
  • Hero Points: 128
Re: vsdiff broken
« Reply #6 on: September 12, 2018, 04:29:05 pm »
Your mailbox seems to be suspended so you will not get notifications about answers in this thread.

lwaynej

  • Community Member
  • Posts: 75
  • Hero Points: 1
Re: vsdiff broken
« Reply #7 on: September 18, 2018, 03:13:22 pm »
I have updated my profile. I haven't had time to try and narrow this down yet.
Another possible variable, I am doing he diff between a local file and a file on a Samba share (Linux.)

lwaynej

  • Community Member
  • Posts: 75
  • Hero Points: 1
Re: vsdiff broken
« Reply #8 on: October 02, 2018, 05:56:06 pm »
I am still having problems with Beta 5. I don't know if they are related.

I am doing a multi-file diff of a directory from Windows. One directory is local and other is on a Linux share (Samba, I think.)

The example happens to be a tab delimited file but I see that same problem with source files (cpp/h) and others.

Diffzilla is showing many files are different.

If I double click on a file it says there are no differences and asks if I want of view the diff anyway.

If I say yes diffzilla shows that there are in fact differences in the file.

I have some screen shots but I will need to obscure some of the info before I can share.

PATH=C:\Program Files\SlickEdit Pro 23.0.0 Beta5\win\...
No other version of slickedit are in the path.
Help/About
=========
SlickEdit Pro 2018 (v23.0.0.6 64-bit)

Serial number: FE11874_BETA
License type: Beta License
License expiration: 2018-10-09 17:00:00
License file: C:\ProgramData\slickedit\23\slickedit.lic

Build Date: September 28, 2018
Emulation: CUA

OS: Windows 7 x64
OS Version: 6.01.7601  Service Pack 1
Memory: 43% Load, 3460MB/7888MB Physical, 4268MB/15774MB Page File, 539MB/8388607MB Virtual
Shell Information: C:\windows\system32\cmd.exe /q
Screen Size: 1920 x 1050, 1920 x 1080

Project Type: Cpp
Language: .mmd (Plain Text)
Encoding: Automatic

Installation Directory: C:\Program Files\SlickEdit Pro 23.0.0 Beta5\ (non-removable drive,NTFS,44243MB free)
Configuration Directory: C:\Users\WJohnson\Documents\My SlickEdit Config\23.0.0\ (non-removable drive,NTFS,44243MB free)
Migrated from: C:\Users\WJohnson\Documents\My SlickEdit Config\22.0.2\


Dan

  • SlickEdit Team Member
  • Senior Community Member
  • *
  • Posts: 2286
  • Hero Points: 128
Re: vsdiff broken
« Reply #9 on: October 02, 2018, 06:07:16 pm »
Is it consistent on the same files?

If you copy the files locally does it do the same thing?

If you go to the options tab, what do you have set for Date and Size Optimization?

lwaynej

  • Community Member
  • Posts: 75
  • Hero Points: 1
Re: vsdiff broken
« Reply #10 on: October 02, 2018, 06:28:48 pm »
It seems to happen consistently with *some* files.

Other files see to work correctly.

I also noticed that the behavior has changed slightly (I think.) When after merging the changes from 1 file to another and then saving, the highlight used to move to the next file and the files were marked at the same. Now they are not moved and the file still shows up as different. Maybe they are different in a way that I have chosen to ignore?

Also, some white space changes don't seem to get saved after doing a merge and then a same. This happens at the end (possible line ending difference) but also at the beginning of a file. I can diff and merge multiple times and it still  shows as different.

I will try copy the file locally and see if I get the same behavior. I am on a deadline right now so I don't know when I will be able to give it a try.

Dan

  • SlickEdit Team Member
  • Senior Community Member
  • *
  • Posts: 2286
  • Hero Points: 128
Re: vsdiff broken
« Reply #11 on: October 02, 2018, 06:32:18 pm »
OK.  I know it's tough with company rules, but if you can get me any two files that it has problems with, that will help.

If you right click, there should be a setting for "viewed files".  This refers to different files that have been viewed, but are still different.  It sounds like maybe you shut this off.

Can you post your diff options?

lwaynej

  • Community Member
  • Posts: 75
  • Hero Points: 1
Re: vsdiff broken
« Reply #12 on: October 19, 2018, 09:36:19 pm »
I am having significant problems with RC2. I am running vsdiff from a script and comparing directories. After I merge the changes to the first file that is different and click save I run into a slick-c stack. I cannot access to the slick-c stack windows because of a constant barrage of modal dialog boxes indicating that there is an "invalid handle".

vsdiff +t -hidematching <directory on Samba share> <local directory on C: in my user folder>


lwaynej

  • Community Member
  • Posts: 75
  • Hero Points: 1
Re: vsdiff broken
« Reply #13 on: October 19, 2018, 11:00:32 pm »
Also, after switching from multiple monitors to a single screen (moving from a docking station with 2 monitors to stand along laptop) when running the script the diff window comes up off the screen. I have to hit Alt+space and then do a move to get it back on the screen.

Dan

  • SlickEdit Team Member
  • Senior Community Member
  • *
  • Posts: 2286
  • Hero Points: 128
Re: vsdiff broken
« Reply #14 on: October 19, 2018, 11:01:44 pm »
I can't reproduce this so far.