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

Re: [TSVN] TMerge ignores language setting?

From: SteveKing <stefankueng_at_gmail.com>
Date: 2005-01-17 11:16:16 CET

On Mon, 17 Jan 2005 10:54:28 +0100, Lübbe Onken <l.onken@rac.de> wrote:
> Steve wrote:
>
> > > TortoiseMerge 1.1.2, Build 2418, MBCS
> > > TortoiseSVN 1.1.2, Build 2418, UNICODE
> >
> > Why should that not be correct? What do you find irritating here?
> MBCS versus Unicode or did I miss a reason why TMerge is MBCS?

TMerge is built with MBCS almost forever now. The reason is that the
Subversion diff library doesn't understand UNICODE files (UTF16 files
to be correct).

> > Also, please explain what you did with TMerge. A two file diff?
> > Resolving a conflict?
> I applied a patch. The save button remains disabled, but I can save the file
> using "save as..."
> I switched to Build 2449, but that doesn't make any difference.

Thanks for the information.

Fixed in revision 2453, also backported to the 1.1.3 branch.

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 Mon Jan 17 11:17:00 2005

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