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

Re: high ascii characters garbled by tortoise merge?

From: Stefan Kng <tortoisesvn_at_gmail.com>
Date: Tue, 14 Oct 2008 19:39:47 +0200

dbssvn_at_lukenine45.net wrote:
> Hello,
>
> I have searched the archives, bug reports, and change log, and I can't
> find any info on this.
>
> We have a file (an .rc file created with visual studio) which contains
> high ( > 127) ascii characters (specifically, 0xa0, a non-breaking
> space). All is well as long as this file is merged automatically, but
> if there is a conflict, and we manually resolve it with tortoise merge
> and save it, the file becomes corrupted (all high-ascii characters
> turn into a nonsense three byte sequence).
>
> Just to be clear, both the two-way and three-way merge programs appear
> to do this.
>
> Has anyone else experienced this?
>
> I could probably come up with an example file if necessary. I'm also
> not averse to try and find and fix the problem myself (I'm checking
> out source code right now) if someone would like to point me in the
> right direction.

Update to TSVN 1.5.4

Stefan

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

Received on 2008-10-14 19:40:08 CEST

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