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

Re: proposal: diff preview for gui client

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2005-06-17 15:08:08 CEST

On Jun 12, 2005, at 2:23 AM, Martin Hauner wrote:

> Philip Martin wrote:
>
>
>> [diff preview]
>> In the short term I suppose a new svn_wc_diff_callbacks2_t will
>> do, in the long term we might need a new RA function that tells us
>> which things have changed without sending the details of the changes,
>> i.e. no text-deltas (and maybe no property changes either).
>>

IIUC, 'svn merge' is now doing exactly this in svn 1.2.

It used to be the case that both 'svn diff' and 'svn merge' requested
a tree-delta from the server which included text-deltas. But this
was sometimes causing timeouts from apache -- apache would detect
zero client reads while the client was busy decompressing text-deltas
and running diff3, and thus apache would forcibly close the connection.

So in svn 1.2, cmpilato changed 'svn merge' to request one of our old-
fashioned tree-delta reports, one which we used to call a "skelta".
It's a tree-delta without any text-deltas, just a description of
which files need to be fetched. 'svn merge' now quickly sucks the
whole skelta into a tmpfile, then parses the skelta slowly, doing
svn_ra_get_file()'s as needed.

So it sounds like we don't need a new RA function here at all, do
we? 'svn merge' is already doing this very thing, so it must be
already possible.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Jun 17 15:10:32 2005

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