You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Greg Stein <gs...@lyra.org> on 2003/11/01 22:06:51 UTC

past(?) wc bug: wrong line endings in text-base

Philip's change to notes/assurance.txt just turned up a bug. It is
probably not present in our code today, but I figured it would be best to
figure out what happened and whether it has been fixed. Hopefully, this
will ring a bell for somebody.

When I went to update, I got the following error:

[gstein@roshi svn]$ svn up
subversion/libsvn_delta/text_delta.c:456: (apr_err=200003)
svn: Incomplete data
svn: Delta source ended unexpectedly
[gstein@roshi svn]$

I tracked this down to updating notes/assurance.txt. Specifically, that
section of code was attempting to read 4067 from ab->source, but it only
got 3975 bytes back. It didn't like that, so it threw an error.

Investigating, I see that assurance.txt with unix newlines is 3975 bytes.
If I run unix2dos on it, then the resulting file is 4067 bytes.

Tracing the code, I find that ab->source holds a stream referring to
notes/.svn/text-base/assurance.txt.svn-base. Looking at my working copy, I
see that the file is, indeed, 3975 bytes. Thus, the stream read is doing
its thing, so why were 4067 requested?

Well, the delta window is expecting the source to be that long. Hmm.
Elsewhere, I checked out a fresh copy of the notes/ directory and *that*
text-base/assurance.txt is 4067 bytes. Ah ha! My text-base is corrupted.

My (corrupted) assurances.txt.svn-base was created on January 13, 2003. Of
course, I could have been using a slightly out-of-date client when that
file was updated (i.e. update, then build a new client, so what was
before?).

Does this "wrong line-endings" within the text-base ring any bells? Given
that a fresh checkout seems to do the right thing, then I'm guessing it
got fixed at some point.

Cheers,
-g

-- 
Greg Stein, http://www.lyra.org/

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

Re: past(?) wc bug: wrong line endings in text-base

Posted by Greg Stein <gs...@lyra.org>.
On Sun, Nov 02, 2003 at 05:26:28PM +0000, Philip Martin wrote:
> Greg Stein <gs...@lyra.org> writes:
> 
> > My (corrupted) assurances.txt.svn-base was created on January 13, 2003. Of
> > course, I could have been using a slightly out-of-date client when that
> > file was updated (i.e. update, then build a new client, so what was
> > before?).
> >
> > Does this "wrong line-endings" within the text-base ring any bells? Given
> > that a fresh checkout seems to do the right thing, then I'm guessing it
> > got fixed at some point.
> 
> Yes, when we started settin svn:eol-style on Subversion files (it
> could well have been Jan 13 2003) bug(s) were revealed.  I believe
> they were fixed shortly thereafter.

Cool. Thanks.

I've tossed the notes/ dir and refetched a clean copy, which fixed it and
also updated me to wc_format 2 for that subdir.

Cheers,
-g

-- 
Greg Stein, http://www.lyra.org/

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

Re: past(?) wc bug: wrong line endings in text-base

Posted by Philip Martin <ph...@codematters.co.uk>.
Greg Stein <gs...@lyra.org> writes:

> My (corrupted) assurances.txt.svn-base was created on January 13, 2003. Of
> course, I could have been using a slightly out-of-date client when that
> file was updated (i.e. update, then build a new client, so what was
> before?).
>
> Does this "wrong line-endings" within the text-base ring any bells? Given
> that a fresh checkout seems to do the right thing, then I'm guessing it
> got fixed at some point.

Yes, when we started settin svn:eol-style on Subversion files (it
could well have been Jan 13 2003) bug(s) were revealed.  I believe
they were fixed shortly thereafter.

-- 
Philip Martin

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