Hi all, Another problem with UTF, now it is problem when merging 2 files which are UTF8 (BOM) The file on local HDD is still UTF8, but the file from repository is ANSI :-() IdFromKodGenerator.cs.merge-left.r43343 - ANSI but in trunk (from I'm doing merge is UTF-8) IdFromKodGenerator.cs.merge-right.r43356 - branch into I'm merging is UTF-8.
Can you help me with that? A. -----Original Message----- From: Ulrich Eckhardt [mailto:eckha...@satorlaser.com] Sent: Thursday, October 14, 2010 1:23 PM To: users@subversion.apache.org Subject: Re: UTF-16 files and inconsistent line endings On Thursday 14 October 2010, David Aldrich wrote: > I am developing with Visual C++ Express 2008 on Windows. I needed to add > some Japanese characters to a source file, whereupon the editor stored the > file in UTF-16LE encoding. Subversion doesn't support UTF-16 as text file, it treats it as unknown (raw binary) file... > Subversion (1.6.12) now complains that the file has inconsistent EOL-style. ...and that doesn't mix well with this text-specific setting. You could try using UTF-8 instead, though I'm not sure how to explain that to MSVC, maybe just storing with a BOM is enough. MSVC allows saving as UTF-8 when choosing "save as" in the "save" button's drop-down list, notepad.exe does that if you save as UTF-8, IIRC. > Is there a workaround for this, such as setting eol-style to CRLF (i.e. not > native)? Simply deleting the svn:eol-style property would also silence the warning. Uli -- ML: http://subversion.apache.org/docs/community-guide/mailing-lists.html FAQ: http://subversion.apache.org/faq.html Docs: http://svnbook.red-bean.com/ Sator Laser GmbH, Fangdieckstraße 75a, 22547 Hamburg, Deutschland Geschäftsführer: Thorsten Föcking, Amtsgericht Hamburg HR B62 932 ************************************************************************************** Sator Laser GmbH, Fangdieckstraße 75a, 22547 Hamburg, Deutschland Geschäftsführer: Thorsten Föcking, Amtsgericht Hamburg HR B62 932 ************************************************************************************** Visit our website at <http://www.satorlaser.de/> ************************************************************************************** Diese E-Mail einschließlich sämtlicher Anhänge ist nur für den Adressaten bestimmt und kann vertrauliche Informationen enthalten. Bitte benachrichtigen Sie den Absender umgehend, falls Sie nicht der beabsichtigte Empfänger sein sollten. Die E-Mail ist in diesem Fall zu löschen und darf weder gelesen, weitergeleitet, veröffentlicht oder anderweitig benutzt werden. E-Mails können durch Dritte gelesen werden und Viren sowie nichtautorisierte Änderungen enthalten. Sator Laser GmbH ist für diese Folgen nicht verantwortlich. **************************************************************************************
