[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

RE: "these files use different carriage return types" error when viewing po files with winmerge

From: Lübbe Onken | RA Consulting <l.onken_at_rac.de>
Date: Tue, 17 Jun 2008 14:00:50 +0200

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hi Mohsen,

You wrote:

> hi, i am seeing the above error everytime i do a diff since eol-style
> has been set to native, this isn't a problem, is it? why has eol-style
> been set to native anyway (just out of my curiosity)?

Eol-style:native forces the "correct" eol-style for the target system. If you check out on unix, you will get CR as eol character, on Windows CRLF, on Mac LF.

Please check your poedit settings. Probably poedit is set to "Unix" (LF) linebreaks. Set it to "Windows" and you should be fine.

Cheers
- - Lübbe

- --
       ___
  oo // \\ "De Chelonian Mobile"
 (_,\/ \_/ \ TortoiseSVN
   \ \_/_\_/> The coolest Interface to (Sub)Version Control
   /_/ \_\ http://tortoisesvn.net
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (MingW32)

iD4DBQFIV6dwm8gezyP1EasRAoJ6AJ9dLvwuzRew2CGWiqZxXJRp9h+TMACWIMch
iX5UZ7prDTfbGEDdj3AC7A==
=Qtk2
-----END PGP SIGNATURE-----

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: dev-help_at_tortoisesvn.tigris.org
Received on 2008-06-17 14:01:05 CEST

This is an archived mail posted to the TortoiseSVN Dev mailing list.