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

wrong conflict file for ucs-2le encoding files

From: moo moo <moo.wejoin_at_gmail.com>
Date: Tue, 30 Mar 2010 22:51:51 -0700 (PDT)

merges with out conflict, the resulting file looks good, which mean
ucs-2le is supported by tsvn
however, when merge conflict, the conflict part of the file is
garbage. i can "grep" the file for ">>>" but can't search for ">>>"
when i vim the file, which mean ">>>" is written in ascii not UCS-2LE
is this a svn or tsvn issue? or maybe i missed some svn/tsvn property
that should fix this problem?

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=2467521

To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-03-31 08:17:05 CEST

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