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

Re: still about utf-8 question in merge

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: 2006-06-09 17:05:05 CEST

feihu_roger wrote:
> one zip file, two dir.
> diff dir :
> example files (UTF-8 with no BOM) and correct show pic, TMerge's font
> is Courier New

Thanks for the files.
Fixed the bug in revision 6751.

> crash dir:
> I found new question, when I diff two files,TMerge crash.
>
> In crash dir, "Deal_edit.php" is same as "Deal_edit2.php", both are UTF-8
> with no BOM. If u use TMerge to diff them, TMerge crash.
>
> My OS is Simple Chinese WinXP with latest Pacth from M$.

I can't make TMerge crash with those files, neither with the fixed
version (with the UTF8 fix mentioned above) nor with the oldest version
from trunk I have currently around (rev 6700).
I guess that means it only crashes on Chinese OS? If that's the case,
then I can't find and fix the bug/crash myself, sorry.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Fri Jun 9 17:09:02 2006

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.