subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stef...@apache.org
Subject svn commit: r1635642 - in /subversion/trunk/subversion/libsvn_fs_x: ./ fs.c hotcopy.c low_level.h
Date Thu, 30 Oct 2014 23:41:18 GMT
Author: stefan2
Date: Thu Oct 30 23:41:18 2014
New Revision: 1635642

URL: http://svn.apache.org/r1635642
Log:
Sync FSX with FSFS:
Merge revisions r1603499, r1604903, r1605059, r1615348, r1617586 and
r1618153 from libsvn_fs_fs and resolve a few text conflicts.

These are just comment / docstring fixes.

Modified:
    subversion/trunk/subversion/libsvn_fs_x/   (props changed)
    subversion/trunk/subversion/libsvn_fs_x/fs.c
    subversion/trunk/subversion/libsvn_fs_x/hotcopy.c
    subversion/trunk/subversion/libsvn_fs_x/low_level.h

Propchange: subversion/trunk/subversion/libsvn_fs_x/
------------------------------------------------------------------------------
  Merged /subversion/trunk/subversion/libsvn_fs_fs:r1603499,1604903,1605059,1615348,1617586,1618153

Modified: subversion/trunk/subversion/libsvn_fs_x/fs.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/fs.c?rev=1635642&r1=1635641&r2=1635642&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/fs.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/fs.c Thu Oct 30 23:41:18 2014
@@ -72,7 +72,7 @@ x_serialized_init(svn_fs_t *fs, apr_pool
      each separate repository opened during the lifetime of the
      svn_fs_initialize pool.  It's unlikely that anyone will notice
      the modest expenditure; the alternative is to allocate each structure
-     in a subpool, add a reference-count, and add a serialized deconstructor
+     in a subpool, add a reference-count, and add a serialized destructor
      to the FS vtable.  That's more machinery than it's worth.
 
      Picking an appropriate key for the shared data is tricky, because,
@@ -80,9 +80,7 @@ x_serialized_init(svn_fs_t *fs, apr_pool
      shared between hotcopied (1), dump / loaded (2) or naively copied (3)
      filesystems.  We tackle this problem by using a combination of the UUID
      and an instance ID as the key.  This allows us to avoid key clashing
-     in (1) and (2) for formats >= SVN_FS_FS__MIN_INSTANCE_ID_FORMAT, which
-     do support instance IDs.  For old formats the shared data (locks, shared
-     transaction data, ...) will still clash.
+     in (1) and (2).
 
      Speaking of (3), there is not so much we can do about it, except maybe
      provide a convenient way of fixing things.  Naively copied filesystems

Modified: subversion/trunk/subversion/libsvn_fs_x/hotcopy.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/hotcopy.c?rev=1635642&r1=1635641&r2=1635642&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/hotcopy.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/hotcopy.c Thu Oct 30 23:41:18 2014
@@ -906,7 +906,8 @@ hotcopy_body(void *baton, apr_pool_t *po
   return SVN_NO_ERROR;
 }
 
-/* Wrapper around hotcopy_body taking out all necessary source repositories.
+/* Wrapper around hotcopy_body taking out all necessary source repository
+ * locks.
  */
 static svn_error_t *
 hotcopy_locking_src_body(void *baton, apr_pool_t *pool)

Modified: subversion/trunk/subversion/libsvn_fs_x/low_level.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/low_level.h?rev=1635642&r1=1635641&r2=1635642&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/low_level.h (original)
+++ subversion/trunk/subversion/libsvn_fs_x/low_level.h Thu Oct 30 23:41:18 2014
@@ -36,6 +36,15 @@ extern "C" {
 #define SVN_FS_X__KIND_FILE          "file"
 #define SVN_FS_X__KIND_DIR           "dir"
 
+/* The functions are grouped as follows:
+ *
+ * - revision footer
+ * - representation (as in "text:" and "props:" lines)
+ * - node revision
+ * - representation header ("DELTA" lines)
+ * - changed path list
+ */
+
 /* Given the last "few" bytes (should be at least 40) of revision REV in
  * TRAILER,  parse the last line and return the offset of the root noderev
  * in *ROOT_OFFSET and the offset of the changed paths list in



Mime
View raw message