SVN merge fails.

[Shaaf Syed M <sh...@gmail.com>]

Hello.

When merging from trunk to branch, I get the following error

svn: Giltig data '||||||| .sammanslagning-v' f?\195?\182 ljdes av
icke-ASCII-byte 195: kan inte konvertera till/fr?\195?\165n UTF-8

While looking into the latest code on the svn.collab.net

File: http://svn.collab.net/viewvc/svn/trunk/subversion/po/sv.po?revision=31444&view=markup


 4665 #: libsvn_subr/utf.c:581
 4666 #, c-format
 4667 msgid ""
 4668 "Safe data '%s' was followed by non-ASCII byte %d: unable to
convert to/from "
 4669 "UTF-8"
 4670 msgstr ""
 4671 "Giltig data '%s' följdes av icke-ASCII-byte %d: kan inte
konvertera till/"
 4672 "från UTF-8"


I think this is where the error is coming from but I am not to sure
what to do with it or how to fix it.

Please help!

Regards.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org