Diff on Vault 2.0 Not Working on Some Files

jswencki · Post by **jswencki** » Wed Feb 25, 2004 5:27 pm

For some reason when looking at the diff between two files, it comes up cryptic, almost like it is binary. We tried other text files of the same type/extension and they don't have the issue.

Any suggestions?

ericsink · Post by **ericsink** » Wed Feb 25, 2004 6:07 pm

jswencki wrote:For some reason when looking at the diff between two files, it comes up cryptic, almost like it is binary. We tried other text files of the same type/extension and they don't have the issue.

Any suggestions?

Well, I hate to give the dumb obvious answer, but: Any chance the file is binary?

If you want smart subtle answers, we'll need more detail. What kind of file is it? What's the filename?

Tom · Post by **Tom** » Thu Apr 29, 2004 9:22 am

I getting this same issue with .prc and .sql files.

Both of these are text files used in Visual Studio 2003 Database Projects.

Tom Cole · Post by **Tom Cole** » Thu Apr 29, 2004 10:28 am

Sorry for the double post.

I just set up my account for the discussion forum and I wanted the reply to be automatically sent to my email.

dan · Post by **dan** » Thu Apr 29, 2004 11:53 am

I guess the place to start is to find out whether the problem is in the diff tool or Vault. Some questions:

1. If you do a "View" from the repository, does the file display correctly?
2. If you do a Get to non working folder on the file versions you want to compare, and manually invoke the diff merge tool, do you get the same results?
3. What happens if you choose a different diff tool - does it display the files correctly inside or outside of Vault?

Tom Cole · Post by **Tom Cole** » Thu Apr 29, 2004 12:14 pm

It's the sgdm.exe that's the problem.

I get the same bad result when I use the sgdm.exe out side the vault as I do while inside the vault.

I can use WinDiff on the files with no problem outside the vault. But I can't use it inside the vault. And besides, your Diff utility is way... cooler. So if there is a way that you can make the sgdm.exe work with .sql and .prc files, that'll be great.

Thanks

Tom Cole · Post by **Tom Cole** » Thu Apr 29, 2004 12:23 pm

Here's another interesting item.

The "Diff" functionality is working. The content is just not displaying correctly. See the attached screen shot.

The highlighted green area is correctly lined up with the addition.

dan · Post by **dan** » Thu Apr 29, 2004 1:08 pm

Can you email me two versions of that file, so we can take a look at it?

Thanks,

Tom Cole · Post by **Tom Cole** » Thu Apr 29, 2004 1:55 pm

Okay here are the files. I changed the extension to .txt so that I can load the files up to the web site.

It is still having the same problem after I change the extension from .prc to .txt.

I suspect that the issue has to do with the encoding of the text.

These files are using UNICODE UCS-2 character set.

That's the standard character set used for NVARCHAR in MS SQL 2000.

Tom Cole · Post by **Tom Cole** » Thu Apr 29, 2004 2:45 pm

I found a solution for my particular issue.

When I use the tool to generate the files in the first place, if I use the option to use ANSI text instead of the default Unicode, everything works.

I still think you guys should look into this.

dan · Post by **dan** » Thu Apr 29, 2004 8:45 pm

Ahh - it is a unicode file. Our diff tool doesn't yet support unicode, but we do plan to add it. Sorry for the inconvenience.

montek · Post by **montek** » Wed Jun 02, 2004 12:11 am

Just wondering if there's been any progress/update on this? I recently was victimized by the lack of Unicode support in DiffMerge. Seems like this should be easy, no?

dan · Post by **dan** » Wed Jun 02, 2004 7:48 am

We still plan to support unicode in a future release. We hope it makes 2.1, but we can't promise that yet...

SourceGear Support

Diff on Vault 2.0 Not Working on Some Files

Diff on Vault 2.0 Not Working on Some Files

Re: Diff on Vault 2.0 Not Working on Some Files

Getting Bad Diff Results on .prc and .sql