subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bre...@apache.org
Subject svn commit: r1565077 - in /subversion/branches/1.8.x: ./ STATUS subversion/libsvn_fs_fs/fs_fs.c
Date Thu, 06 Feb 2014 05:22:24 GMT
Author: breser
Date: Thu Feb  6 05:22:23 2014
New Revision: 1565077

URL: http://svn.apache.org/r1565077
Log:
Merge the 1.8.x-r1554978 branch:

 * r1554978
   In FSFS, svn_fs_get_file_delta_stream shall return strictly the delta requested.
   Justification:
     The delta stream returned here has been valid (a self-delta is a valid
     txdelta against *any* source) but it may not strictly be what the user
     requested.  As a side effect, this will produce smaller deltified dumps.
   Branch:
     ^/subversion/branches/1.8.x-r1554978
   Votes:
     +1: stefan2, rhuijben, breser

Modified:
    subversion/branches/1.8.x/   (props changed)
    subversion/branches/1.8.x/STATUS
    subversion/branches/1.8.x/subversion/libsvn_fs_fs/fs_fs.c

Propchange: subversion/branches/1.8.x/
------------------------------------------------------------------------------
  Merged /subversion/branches/1.8.x-r1554978:r1555500-1565076
  Merged /subversion/trunk:r1554978

Modified: subversion/branches/1.8.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1565077&r1=1565076&r2=1565077&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Thu Feb  6 05:22:23 2014
@@ -206,17 +206,6 @@ Veto-blocked changes:
 Approved changes:
 =================
 
- * r1554978
-   In FSFS, svn_fs_get_file_delta_stream shall return strictly the delta requested.
-   Justification:
-     The delta stream returned here has been valid (a self-delta is a valid
-     txdelta against *any* source) but it may not strictly be what the user
-     requested.  As a side effect, this will produce smaller deltified dumps.
-   Branch:
-     ^/subversion/branches/1.8.x-r1554978
-   Votes:
-     +1: stefan2, rhuijben, breser
-
  * r1551524, 1551579
    Fix an 'No Write Lock' error when moving files between externals and
    parent working copies or vice versa.

Modified: subversion/branches/1.8.x/subversion/libsvn_fs_fs/fs_fs.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/libsvn_fs_fs/fs_fs.c?rev=1565077&r1=1565076&r2=1565077&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/libsvn_fs_fs/fs_fs.c (original)
+++ subversion/branches/1.8.x/subversion/libsvn_fs_fs/fs_fs.c Thu Feb  6 05:22:23 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));



Mime
View raw message