EOL settings not honoured in Diff under Mono/Linux

This forum is now locked, since Gold Support is no longer offered.

Moderator: SourceGear

Locked
paul-shed
Posts: 19
Joined: Thu Mar 22, 2007 11:00 am

EOL settings not honoured in Diff under Mono/Linux

Post by paul-shed » Wed Jun 27, 2007 7:23 am

Hello,

I'm having some trouble using diff in the CLC under mono/Linux. I'm doing some cross platform development and I am editing sources under Windows. These sources have CRLF for newlines. When I check out these files under Linux the newline is correctly replaced with LF. Nice, no problem there.

But when I do a diff with the repository under mono/Linux the version that is fetched from vault for comparison does not honour the configured EOL settings. This results in differences for every line. Is this a know feature? or am I doing something wrong? I would expect the configured EOL rules to apply when doing a diff.

Setup is as follows.

Vault (3.5.1) 4786 (EOL setting for the DB is set to Native)
Windows XP SP2 client
Windows 2000 server (vault DB and server)
Slackware Linux 11 client
vault.exe -compareto option 'current'
mono 1.2.4

This look very similar to a problem a user had a couple of years back.

http://support.sourcegear.com/viewtopic ... t=eol+diff

But the thread went cold .....

And after all the CLC pain please can we have a GUI that runs under Linux, please !!

Regards,

Shed

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

Post by Beth » Wed Jun 27, 2007 1:23 pm

What I can do right now is to enter a feature request for an -eol on Diff.

In the meantime, on your Get you can set an -eol option for "LF".

From our CLC Documentation under Get options:
-eol type

Mergable files which normally convert to native EOL will be converted to the given line-ending type when fetched. Available types are: "none", "cr", "lf", or "crlf".

paul-shed
Posts: 19
Joined: Thu Mar 22, 2007 11:00 am

Post by paul-shed » Thu Jun 28, 2007 5:54 am

In the version of Vault I'm using (4.5.1) it appears that -eof is not a recognised option for get. Is this only available in 4.0?

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

Post by Beth » Thu Jun 28, 2007 7:28 am

I'm going to assume you mean 4.0.1 (we don't have a 4.5.x yet). That shouldn't have changed, but I'll check into it.

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

Post by Beth » Thu Jun 28, 2007 10:29 am

OH, you typed -eof. That's something entirely different (unless you have a typo here). It should be -eol. No 'f' in it.

paul-shed
Posts: 19
Joined: Thu Mar 22, 2007 11:00 am

Post by paul-shed » Thu Jun 28, 2007 11:26 am

Sorry my fault, I've just double checked.

I did use -eol lf and the version is 3.5.1 as stated in my first post.

Regards,

Paul

jeremy_sg
Posts: 1821
Joined: Thu Dec 18, 2003 11:39 am
Location: Sourcegear
Contact:

Post by jeremy_sg » Fri Jun 29, 2007 12:45 pm

Yes, the 4.0 CLC supports the -eol parameter for get to override the native EOL.

Locked