[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-10 07:04:22 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.

Thans Stefan.

>
> > 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.
Maybe the bug with Chinese OS. I diff those files in other PC ,with
Tmerge 1.2.4, still crash.

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

__________________________________________________
¸Ï¿ì×¢²áÑÅ»¢³¬´óÈÝÁ¿Ãâ·ÑÓÊÏä?
http://cn.mail.yahoo.com

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Sat Jun 10 07:04:37 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.