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

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.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=2467815
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].