the ^@ makes me wonder if perhaps one user has an editor that saves
the file as unicode UTF-16. Subversion doesn't handle non eight-bit
character sets well.
-David Waite
On Thu, 17 Feb 2005 22:12:34 -0600, Ben Collins-Sussman
<sussman@collab.net> wrote:
>
> 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:
>
> http://svnbook.red-bean.com/en/1.1/ch03s05.html#svn-ch-3-sect-5.4
>
> 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
>
>
---------------------------------------------------------------------
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:34:40 2005