EOL problems with diff

George · Post by **George** » Wed Nov 09, 2005 2:20 pm

There is a problem with the way line endings are handled on Linux when doing a diff.

If I do a clean 'mono vault.exe get' and the immediately do 'mono vault.exe diff' on one of the files, Vault will think that every line has changed.

If I then change the the same file to use CRLF line endings (with an editor - vim) then retry the 'mono vault.exe diff'. Then it will correctly tell me that there were no changes.

I am using Vault 3.1.5 and mono 1.1.10.

lbauer · Post by **lbauer** » Thu Nov 10, 2005 8:41 am

Thanks for the report. We'll have our Linux/Mono specialist take a look at this.

George · Post by **George** » Tue Nov 22, 2005 9:42 am

In lieu of a fix for diffs. Is there are way that I can get the vault client to use CRLF line endings for get/checkout?

Currently I get the current version. Fix the line endings. Get the current version and fix the line endings again.

Thanks.

dan · Post by **dan** » Tue Nov 22, 2005 9:48 am

The diff problem will be fixed in an upcoming 3.1.6 (hopefully in the next week or so).

You can tell a file to use CRLF via the properties dialog in the Vault GUI client, which might be a good workaround for now.

Sorry for the inconenience

Post by **jclausius** » Tue Nov 22, 2005 9:58 am

One other possibility would be to use the -VAULTDIFF_OPTIONS -b or -w in your CLC telling diff to ignore white space changes.

See "vault.exe help DIFF" for passing options to the diff utility.