Alec Munro <alecmunro@gmail.com> writes:
> Hi, and thanks for the response.
>
> The files are plain text, it's all just testing stuff so far, so I am
> all the users, and the file (there really is only one so far) is just
> 7 lines.
>
> SVN is installed on a gentoo server, I'm using a Windows 2003 desktop
> with TortoiseSVN and the command line as the primary client, but I've
> also tested from the server itself, and another gentoo system, with
> the same results every time.
>
> I will look into the UTF-16 theory. I'm skeptical, but I certainly
> can't rule it out.
>
> I tried to copy/paste the corrupted file, but either google or firefox
> doesn't want me to paste that text into this field. I have attached
> the file, I hope it helps.
You're only showing us the conflicted file; we need to see the
original file, as it looked before Subversion did anything to it.
The file you attached binary (i.e., not ASCII or UTF-8). It looks
like it might be UTF-16, but I can't be sure. The important question
here is, by what method did you add it to Subversion, and why didn't
Subversion notice that it is binary?
-Karl
> Thanks for your responses.
>
> Alec Munro
>
>
> On Thu, 17 Feb 2005 21:32:09 -0700, David Waite <dwaite@gmail.com> wrote:
> > 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
> > >
> > >
> >
>
> ˙ūZ
>
>
>
>
>
> <<<<<<< .mine
>
>
> =======
>
>
> >>>>>>> .r9
>
>
>
>
>
>
>
> ---------------------------------------------------------------------
> 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 18:17:22 2005