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

TortoiseSVN (nightly build 18837) still does not handle UTF-8 files during "Apply patch"

From: Carsten Schuette <schuettecarsten_at_googlemail.com>
Date: Wed, 10 Mar 2010 04:43:09 -0800 (PST)

Hi,

I have several files in UTF8 format. The problem I reported some weeks
agou about BOM markers seem to be solved, but there is a new issue
now:

I have created a patch file which looks like this:

Index: Neusta/Neusta.CodeLibrary.BusinessObjects/Attributes/
MappingDirection.cs
===================================================================
--- Neusta/Neusta.CodeLibrary.BusinessObjects/Attributes/
MappingDirection.cs
+++ Neusta/Neusta.CodeLibrary.BusinessObjects/Attributes/
MappingDirection.cs
@@ -6,6 +6,7 @@
         /// Gibt die erlaubten Richtungen bei der Ãœbertragung von Werten
über die MapTo-/MapFrom-Funktionen an
         /// </summary>
         [Serializable]
+ [Flags]
         public enum MappingDirection
         {
                 None = 0,

The line after the @@ contains UTF8 encoded german umlauts. The file
"MappingDirection.cs" on the target system contains exactly the same
line. But I am not able to apply the patch, because TortoiseMerge does
not handle the diffent encodings of the patch file (ANSI) and the
target file (UTF8).

IMHO TortoiseMerge must ignore the UTF8 format of the target file if
the patch is in an ANSI encoded format.

Any ideas how to solve this?

Carsten

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2457593

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-03-10 13:43:13 CET

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