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

Re: wrong conflict file for ucs-2le encoding files

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Wed, 31 Mar 2010 19:11:12 +0200

On 31.03.2010 07:51, moo moo wrote:
> 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?

Subversion can't handle ucs-2le files. While it can merge those if there
are no conflicts, it doesn't so if there are conflicts. As you've
noticed it doesn't write the conflict markers properly.

This is an issue in the svn library.


   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-03-31 19:11:30 CEST

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.