You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2014/01/05 15:27:18 UTC
svn commit: r1555514 - in /subversion/branches/1.8.x-r1554978: ./
subversion/libsvn_fs_fs/fs_fs.c
Author: stefan2
Date: Sun Jan 5 14:27:17 2014
New Revision: 1555514
URL: http://svn.apache.org/r1555514
Log:
Merged r1554978 from /trunk and resolved the usual FSFS reorg conflict.
Modified:
subversion/branches/1.8.x-r1554978/ (props changed)
subversion/branches/1.8.x-r1554978/subversion/libsvn_fs_fs/fs_fs.c
Propchange: subversion/branches/1.8.x-r1554978/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1554978
Modified: subversion/branches/1.8.x-r1554978/subversion/libsvn_fs_fs/fs_fs.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x-r1554978/subversion/libsvn_fs_fs/fs_fs.c?rev=1555514&r1=1555513&r2=1555514&view=diff
==============================================================================
--- subversion/branches/1.8.x-r1554978/subversion/libsvn_fs_fs/fs_fs.c (original)
+++ subversion/branches/1.8.x-r1554978/subversion/libsvn_fs_fs/fs_fs.c Sun Jan 5 14:27:17 2014
@@ -5380,11 +5380,13 @@ svn_fs_fs__get_file_delta_stream(svn_txd
/* Read target's base rep if any. */
SVN_ERR(create_rep_state(&rep_state, &rep_args, NULL, NULL,
target->data_rep, fs, pool));
- /* If that matches source, then use this delta as is. */
+
+ /* If that matches source, then use this delta as is.
+ Note that we want an actual delta here. E.g. a self-delta would
+ not be good enough. */
if (rep_args->is_delta
- && (rep_args->is_delta_vs_empty
- || (rep_args->base_revision == source->data_rep->revision
- && rep_args->base_offset == source->data_rep->offset)))
+ && rep_args->base_revision == source->data_rep->revision
+ && rep_args->base_offset == source->data_rep->offset)
{
/* Create the delta read baton. */
struct delta_read_baton *drb = apr_pcalloc(pool, sizeof(*drb));