Re: AW: BUG: TortoiseMerge encoding (UTF-8)

Andreas Schnederle-Wagner - Futureweb.at wrote:
> Andreas Schnederle-Wagner - Futureweb.at wrote:
>>> All our Files are saved in UTF-8 without BOM. I got several
>>> Branches of our main development tree. Everytime when I MERGE the
>>> branches with the main development tree and fix the conflicts
>>> with the TortoiseMerge Client (Windows) the resulting File is
>>> saved in ASCII LF (original was UTF8 CRLF) and all special
>>> characters are broken since the file isn't UTF-8 anymore.
>
> Stefan wrote:
>> Which version of TSVN are you using? TortoiseMerge shows the
>> encoding at the bottom in the status bar. What does it say there?
>
> Using TortoiseSVN 1.5.2, Build 13595 - 32 Bit on my Windows XP SP3
> Machine. Tried it on another Machine with Nightly Build 1.5.2.13692 -
> no luck!
>
> When i open a File in TortoiseMerge and my File Contains a special
> Character like "ä ü ö" TortoiseMerge shows me "UTF8 CRLF" in the
> Status Bar. If i delete those special Characters with the same
> Program I saved the File before TortoiseMerge suddenly shows me
> "ASCII CRLF" in the Status Bar - but the File is still UTF8 ...
> TortoiseMerge just don't recognizes the Encoding anymore.

Ahem: if there are no utf8 chars in a file, the encoding is the very
same as ASCII/ANSI, because in that case the files are identical whether
they're in utf8 or not.
So: if there are no 'special' chars in your file, it is *not* utf8
encoded but plain ANSI.

> When I do a merge on a heavy modified file - so I get the manual
> Resolve Conflict in TortoiseMerge and I have on both sides File
> containing Special Characters - so TortoiseMerge notices that booth
> are "UTF8 CRLF" (Shown for booth Files in Status Bar) and I resolve
> the Conflict - safe the File - click resolved - merging happens. Now
> I open the newly merged File - and all specials Characters are gone
> (replaced with �) - if I open the new file with TortoiseMerge the
> Status Bar tells me that the file is "ASCII CRLF" and I see Changes
> (the � where my special Characters should be) So TortoiseMerge merged
> 2 UTF-8 Files into 1 ASCII with broken special Characters.
>
> I hope my Information help you finding the Bug! Greetings from
> Austria

Can you send me the three files you are trying to merge (or ones that
show the problem if yours are confidential)?

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net