svn commit: r1434961 - /subversion/branches/fsfs-format7/subversion/libsvn_fs_fs/pack.c

[st...@apache.org]

Author: stefan2
Date: Thu Jan 17 23:31:51 2013
New Revision: 1434961

URL: http://svn.apache.org/viewvc?rev=1434961&view=rev
Log:
On the fsfs-format7 branch: Fix pack logic.

* subversion/libsvn_fs_fs/pack.c
  (copy_indexes): move offset to next expected location and compare
   that to actuals to detect duplicates

Modified:
    subversion/branches/fsfs-format7/subversion/libsvn_fs_fs/pack.c

Modified: subversion/branches/fsfs-format7/subversion/libsvn_fs_fs/pack.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/libsvn_fs_fs/pack.c?rev=1434961&r1=1434960&r2=1434961&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/libsvn_fs_fs/pack.c (original)
+++ subversion/branches/fsfs-format7/subversion/libsvn_fs_fs/pack.c Thu Jan 17 23:31:51 2013
@@ -136,7 +136,7 @@ copy_indexes(svn_fs_t *fs,
 
           /* skip first entry if that was duplicated due crossing a
              cluster boundary */
-          if (offset == entry->offset)
+          if (offset > entry->offset)
             continue;
 
           /* process entry while inside the rev file */
@@ -144,6 +144,7 @@ copy_indexes(svn_fs_t *fs,
           if (offset < file_size)
             {
               entry->offset += pack_offset;
+              offset += entry->size;
               SVN_ERR(svn_fs_fs__l2p_proto_index_add_entry(proto_l2p_index,
                                                            entry->offset,
                                                            entry->item_index,