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

Re: Possible skelta weirdness in mod_dav_svn responses.

From: C. Michael Pilato <cmpilato_at_collab.net>
Date: 2005-04-01 15:30:15 CEST

"C. Michael Pilato" <cmpilato@collab.net> writes:

> Josh Pieper <jjp@pobox.com> writes:
> > If you run:
> >
> > svn diff -r1:2 http://svn.collab.net/repos/svn
> >
> > using /trunk svn and look at the DAV response you will see that it has
> > both a <txdelta> tag and a <fetch-file> tag.
> >
> > ...
> > <S:txdelta>U1ZOAA==
> > </S:txdelta><S:fetch-file base-checksum="e34baf2a1f5018f69b5a3ba4de71c069"/>
> > ...
> >
> > This causes mod_dav_svn to call apply_textdelta twice on the same
> > file, a violation of our editor ordering constraints. Talking with
> > sussman on IRC, he indicated that this might be latent buggy behavior,
> > brought to the surface by cmpilato's recent changes to fix timeouts in
> > merge/diff by requesting skeltas.
> >
> > cmpilato, any insights into this odd behavior?
> It's extremely likely that this bug was introduced when the "send-all"
> REPORT style was created some time ago.
> It will need to be fixed in the server code, but we'll also need to
> detect this case in the client and deal with that appropriately. I'll
> take care of both.

Hrm. Oddly enough, it seems we've made a pass at this fix before...

         ### This conditional was added to counteract a little bug in
         Subversion 0.33.0's mod_dav_svn whereby both the <txdelta>
         and <fetch-file> tags were being transmitted. Someday, we
         should remove the conditional again to give the server the
         option of sending inline text-deltas for some files while
         telling the client to fetch others. */

To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Apr 1 15:34:34 2005

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