subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From danie...@apache.org
Subject svn commit: r1166491 - /subversion/branches/fs-successor-ids/subversion/libsvn_fs_fs/fs_fs.c
Date Thu, 08 Sep 2011 01:12:56 GMT
Author: danielsh
Date: Thu Sep  8 01:12:56 2011
New Revision: 1166491

URL: http://svn.apache.org/viewvc?rev=1166491&view=rev
Log:
On the fs-successor-ids branch: simplify.

* subversion/libsvn_fs_fs/fs_fs.c
  (update_successor_map): Simplify computation of PERMS_REFERENCE.

Modified:
    subversion/branches/fs-successor-ids/subversion/libsvn_fs_fs/fs_fs.c

Modified: subversion/branches/fs-successor-ids/subversion/libsvn_fs_fs/fs_fs.c
URL: http://svn.apache.org/viewvc/subversion/branches/fs-successor-ids/subversion/libsvn_fs_fs/fs_fs.c?rev=1166491&r1=1166490&r2=1166491&view=diff
==============================================================================
--- subversion/branches/fs-successor-ids/subversion/libsvn_fs_fs/fs_fs.c (original)
+++ subversion/branches/fs-successor-ids/subversion/libsvn_fs_fs/fs_fs.c Thu Sep  8 01:12:56
2011
@@ -6296,16 +6296,7 @@ update_successor_map(svn_fs_t *fs,
                                            new_rev, successor_ids, pool));
 
   /* Move temporary files into place. */
-  if (new_rev > 1 && new_rev % FSFS_SUCCESSORS_MAX_REVS_PER_FILE != 0)
-    perms_reference = successor_ids_abspath;
-  else if (new_rev > 1)
-    perms_reference = path_successor_ids(fs, new_rev - 1, pool);
-  else
-    {
-      /* Use 'current' as perms reference. */
-      perms_reference = svn_fs_fs__path_current(fs, pool);
-    }
-
+  perms_reference = path_successor_ids(fs, new_rev - 1, pool);
   SVN_ERR(move_into_place(successor_ids_temp_abspath,
                           successor_ids_abspath, perms_reference,
                           pool));



Mime
View raw message