[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: feihu_roger <feihu_roger_at_yahoo.com.cn>
Date: 2006-06-09 16:30:14 CEST

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

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$.

> On 6/8/06, feihu_roger <feihu_roger@yahoo.com.cn> wrote:
> > I change font, It can not display corrent.
> > I don't set $DATE$ keyword.
> >
> > 1.png
> > font:Courier New
> >
> > 2.png
> > font:NewSong (chinese font)
> >
> > 3.png
> > Diff Viewer set to UltraEdit ucl.exe(UltraCompare)
> > font:Courier New
> > This is Ok. u can see thers are four corrent Chinese characters .
> >
>
> Can you please send me two example files to diff where the chars
> aren't shown correctly (including a screenshot of how they *should*
> look so I can check a possible fix for this).
> Don't forget to zip those files, otherwise the mail client/server
> might re-encode the text in those files...
>
> 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

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org

__________________________________________________
8O?lW"2aQE;"3,4sH]A?Cb7QSJOd?
http://cn.mail.yahoo.com

  • application/octet-stream attachment: merge.rar
Received on Fri Jun 9 16:30:42 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.