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

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

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2005-02-18 05:12:34 CET

On Feb 17, 2005, at 9:04 AM, Alec Munro wrote:
> 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.)

The terminology is "conflict", and what svn does is create conflict
markers within the file. It's documented here in the book:


Just a guess, here: what sort of file is this? A plain text-file? Or
is it some sort of binary file? Because I promise, if you take a
binary-format file and ask svn to perform a 3-way line-based merge with
conflict markers, you're gonna get garbage. :-)

If the file *is* binary, has it not been marked as such? Does it have
an svn:mime-type property attached? Please show us a whole lot more
detail. Show us specific commands, specific results.

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Feb 18 05:14:56 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.