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

high ascii characters garbled by tortoise merge?

From: <dbssvn_at_lukenine45.net>
Date: Tue, 14 Oct 2008 10:30:31 -0700 (PDT)

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.

Thank you for your time

Daniel

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
Received on 2008-10-14 19:33:34 CEST

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