subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stef...@apache.org
Subject svn commit: r1580406 - /subversion/trunk/subversion/libsvn_fs_fs/cached_data.c
Date Sun, 23 Mar 2014 01:16:32 GMT
Author: stefan2
Date: Sun Mar 23 01:16:31 2014
New Revision: 1580406

URL: http://svn.apache.org/r1580406
Log:
* subversion/libsvn_fs_fs/cached_data.c
  (svn_fs_fs__get_file_delta_stream): Use the plain delta windows only
                                      if we don't want and can provide
                                      simple plaintext.

Modified:
    subversion/trunk/subversion/libsvn_fs_fs/cached_data.c

Modified: subversion/trunk/subversion/libsvn_fs_fs/cached_data.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/cached_data.c?rev=1580406&r1=1580405&r2=1580406&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/cached_data.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/cached_data.c Sun Mar 23 01:16:31 2014
@@ -1883,10 +1883,11 @@ svn_fs_fs__get_file_delta_stream(svn_txd
   svn_stream_t *source_stream, *target_stream;
   rep_state_t *rep_state;
   svn_fs_fs__rep_header_t *rep_header;
+  fs_fs_data_t *ffd = fs->fsap_data;
 
   /* Try a shortcut: if the target is stored as a delta against the
      source, then just use that delta. */
-  if (target->data_rep)
+  if (target->data_rep && (source || ! ffd->fulltext_cache))
     {
       /* Read target's base rep if any. */
       SVN_ERR(create_rep_state(&rep_state, &rep_header, NULL,



Mime
View raw message