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

When SVN edits a file itself (i.e. to resolve conflicts), the text is corrupted.

From: Alec Munro <alecmunro_at_gmail.com>
Date: 2005-02-17 16:04:54 CET

Hi list,

I've just started using SVN, and it is my first serious foray into
version control. I'm delighted to have it, but it seems that there
must be an error in the way I set it up.

I'm using gentoo 2004.3, and whenever an event occurs that requires
SVN to edit a file itself, such as two users making incompatible
changes to a file (I'm unsure of the official lingo, but collision
sounds good in my head), I end up with a lot of garbage in the file as
well. It shows up differently in different text editors (metapad
complains about non-ANSI characters, kwrite just displays three
characters which don't seem to have any relation to the file. Vim
displays the file with "^@" before every character, except the ones
inserted by SVN. Abiword displays the text properly, but displays the
characters inserted by SVN as unknowns.)

My guess is that SVN is re-encoding the file once it has changed it,
and this is somehow disagreeable to either the server's system, or the
clients. But I am clueless as to how to verify this is the case, let
alone fix it.


Alec Munro

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Feb 18 04:45:37 2005

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.