subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stef...@apache.org
Subject svn commit: r1498717 - /subversion/branches/fsfs-format7/subversion/libsvn_fs_x/transaction.c
Date Mon, 01 Jul 2013 22:03:08 GMT
Author: stefan2
Date: Mon Jul  1 22:03:08 2013
New Revision: 1498717

URL: http://svn.apache.org/r1498717
Log:
On the fsfs-format7 branch: follow-up to r1498393.
Re-introduce some code that got removed accidentally.

* subversion/libsvn_fs_x/transaction.c
  (write_final_rev): properly assign item_indexes

Modified:
    subversion/branches/fsfs-format7/subversion/libsvn_fs_x/transaction.c

Modified: subversion/branches/fsfs-format7/subversion/libsvn_fs_x/transaction.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/libsvn_fs_x/transaction.c?rev=1498717&r1=1498716&r2=1498717&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/libsvn_fs_x/transaction.c (original)
+++ subversion/branches/fsfs-format7/subversion/libsvn_fs_x/transaction.c Mon Jul  1 22:03:08
2013
@@ -2668,10 +2668,15 @@ write_final_rev(const svn_fs_id_t **new_
     noderev->copyroot_rev = rev;
 
   SVN_ERR(svn_fs_x__get_file_offset(&my_offset, file, pool));
-
-  /* reference the root noderev from the log-to-phys index */
-  rev_item.number = SVN_FS_X__ITEM_INDEX_ROOT_NODE;
-  SVN_ERR(store_l2p_index_entry(fs, txn_id, my_offset, rev_item.number,
+  if (at_root)
+    {
+      /* reference the root noderev from the log-to-phys index */
+      rev_item.number = SVN_FS_X__ITEM_INDEX_ROOT_NODE;
+      SVN_ERR(store_l2p_index_entry(fs, txn_id, my_offset, rev_item.number,
+                                    pool));
+    }
+  else
+    SVN_ERR(allocate_item_index(&rev_item.number, fs, txn_id, my_offset,
                                 pool));
 
   rev_item.revision = rev;



Mime
View raw message