subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stef...@apache.org
Subject svn commit: r1498684 - /subversion/branches/fsfs-format7/subversion/libsvn_fs_x/
Date Mon, 01 Jul 2013 21:00:04 GMT
Author: stefan2
Date: Mon Jul  1 21:00:03 2013
New Revision: 1498684

URL: http://svn.apache.org/r1498684
Log:
On the fsfs-format7 branch:  Global commentary update replacing
all references to "FSFS", "fsfs" and "fs_fs" with "FSX", "fsx"
and "fs_x", respectively.  No functional change.

* subversion/libsvn_fs_x/cached_data.c
* subversion/libsvn_fs_x/cached_data.h
* subversion/libsvn_fs_x/caching.c
* subversion/libsvn_fs_x/changes.c
* subversion/libsvn_fs_x/changes.h
* subversion/libsvn_fs_x/fs.c
* subversion/libsvn_fs_x/fs.h
* subversion/libsvn_fs_x/fs_x.c
* subversion/libsvn_fs_x/fs_x.h
* subversion/libsvn_fs_x/hotcopy.c
* subversion/libsvn_fs_x/hotcopy.h
* subversion/libsvn_fs_x/id.h
* subversion/libsvn_fs_x/index.c
* subversion/libsvn_fs_x/index.h
* subversion/libsvn_fs_x/lock.c
* subversion/libsvn_fs_x/low_level.c
* subversion/libsvn_fs_x/low_level.h
* subversion/libsvn_fs_x/noderevs.c
* subversion/libsvn_fs_x/noderevs.h
* subversion/libsvn_fs_x/pack.c
* subversion/libsvn_fs_x/pack.h
* subversion/libsvn_fs_x/recovery.c
* subversion/libsvn_fs_x/recovery.h
* subversion/libsvn_fs_x/rep-cache.c
* subversion/libsvn_fs_x/reps.c
* subversion/libsvn_fs_x/reps.h
* subversion/libsvn_fs_x/revprops.c
* subversion/libsvn_fs_x/revprops.h
* subversion/libsvn_fs_x/string_table.h
* subversion/libsvn_fs_x/temp_serializer.c
* subversion/libsvn_fs_x/temp_serializer.h
* subversion/libsvn_fs_x/transaction.c
* subversion/libsvn_fs_x/transaction.h
* subversion/libsvn_fs_x/tree.c
* subversion/libsvn_fs_x/util.c
* subversion/libsvn_fs_x/util.h
* subversion/libsvn_fs_x/verify.c
* subversion/libsvn_fs_x/verify.h: update commentary

Modified:
    subversion/branches/fsfs-format7/subversion/libsvn_fs_x/cached_data.c
    subversion/branches/fsfs-format7/subversion/libsvn_fs_x/cached_data.h
    subversion/branches/fsfs-format7/subversion/libsvn_fs_x/caching.c
    subversion/branches/fsfs-format7/subversion/libsvn_fs_x/changes.c
    subversion/branches/fsfs-format7/subversion/libsvn_fs_x/changes.h
    subversion/branches/fsfs-format7/subversion/libsvn_fs_x/fs.c
    subversion/branches/fsfs-format7/subversion/libsvn_fs_x/fs.h
    subversion/branches/fsfs-format7/subversion/libsvn_fs_x/fs_x.c
    subversion/branches/fsfs-format7/subversion/libsvn_fs_x/fs_x.h
    subversion/branches/fsfs-format7/subversion/libsvn_fs_x/hotcopy.c
    subversion/branches/fsfs-format7/subversion/libsvn_fs_x/hotcopy.h
    subversion/branches/fsfs-format7/subversion/libsvn_fs_x/id.h
    subversion/branches/fsfs-format7/subversion/libsvn_fs_x/index.c
    subversion/branches/fsfs-format7/subversion/libsvn_fs_x/index.h
    subversion/branches/fsfs-format7/subversion/libsvn_fs_x/lock.c
    subversion/branches/fsfs-format7/subversion/libsvn_fs_x/low_level.c
    subversion/branches/fsfs-format7/subversion/libsvn_fs_x/low_level.h
    subversion/branches/fsfs-format7/subversion/libsvn_fs_x/noderevs.c
    subversion/branches/fsfs-format7/subversion/libsvn_fs_x/noderevs.h
    subversion/branches/fsfs-format7/subversion/libsvn_fs_x/pack.c
    subversion/branches/fsfs-format7/subversion/libsvn_fs_x/pack.h
    subversion/branches/fsfs-format7/subversion/libsvn_fs_x/recovery.c
    subversion/branches/fsfs-format7/subversion/libsvn_fs_x/recovery.h
    subversion/branches/fsfs-format7/subversion/libsvn_fs_x/rep-cache.c
    subversion/branches/fsfs-format7/subversion/libsvn_fs_x/reps.c
    subversion/branches/fsfs-format7/subversion/libsvn_fs_x/reps.h
    subversion/branches/fsfs-format7/subversion/libsvn_fs_x/revprops.c
    subversion/branches/fsfs-format7/subversion/libsvn_fs_x/revprops.h
    subversion/branches/fsfs-format7/subversion/libsvn_fs_x/string_table.h
    subversion/branches/fsfs-format7/subversion/libsvn_fs_x/temp_serializer.c
    subversion/branches/fsfs-format7/subversion/libsvn_fs_x/temp_serializer.h
    subversion/branches/fsfs-format7/subversion/libsvn_fs_x/transaction.c
    subversion/branches/fsfs-format7/subversion/libsvn_fs_x/transaction.h
    subversion/branches/fsfs-format7/subversion/libsvn_fs_x/tree.c
    subversion/branches/fsfs-format7/subversion/libsvn_fs_x/util.c
    subversion/branches/fsfs-format7/subversion/libsvn_fs_x/util.h
    subversion/branches/fsfs-format7/subversion/libsvn_fs_x/verify.c
    subversion/branches/fsfs-format7/subversion/libsvn_fs_x/verify.h

Modified: subversion/branches/fsfs-format7/subversion/libsvn_fs_x/cached_data.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/libsvn_fs_x/cached_data.c?rev=1498684&r1=1498683&r2=1498684&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/libsvn_fs_x/cached_data.c (original)
+++ subversion/branches/fsfs-format7/subversion/libsvn_fs_x/cached_data.c Mon Jul  1 21:00:03 2013
@@ -1,4 +1,4 @@
-/* cached_data.c --- cached (read) access to FSFS data
+/* cached_data.c --- cached (read) access to FSX data
  *
  * ====================================================================
  *    Licensed to the Apache Software Foundation (ASF) under one
@@ -671,7 +671,7 @@ create_rep_state(rep_state_t **rep_state
       /* ### This always returns "-1" for transaction reps, because
          ### this particular bit of code doesn't know if the rep is
          ### stored in the protorev or in the mutable area (for props
-         ### or dir contents).  It is pretty rare for FSFS to *read*
+         ### or dir contents).  It is pretty rare for FSX to *read*
          ### from the protorev file, though, so this is probably OK.
          ### And anyone going to debug corruption errors is probably
          ### going to jump straight to this comment anyway! */
@@ -824,7 +824,7 @@ get_window_key(window_cache_key_t *key, 
 }
 
 /* Read the WINDOW_P number CHUNK_INDEX for the representation given in
- * rep state RS from the current FSFS session's cache.  This will be a
+ * rep state RS from the current FSX session's cache.  This will be a
  * no-op and IS_CACHED will be set to FALSE if no cache has been given.
  * If a cache is available IS_CACHED will inform the caller about the
  * success of the lookup. Allocations (of the window in particualar) will
@@ -938,7 +938,7 @@ get_cached_window(svn_txdelta_window_t *
 }
 
 /* Store the WINDOW read for the rep state RS with the given START_OFFSET
- * within the pack / rev file in the current FSFS session's cache.  This
+ * within the pack / rev file in the current FSX session's cache.  This
  * will be a no-op if no cache has been given.
  * Temporary allocations will be made from SCRATCH_POOL. */
 static svn_error_t *
@@ -968,7 +968,7 @@ set_cached_window(svn_txdelta_window_t *
   return SVN_NO_ERROR;
 }
 
-/* Read the WINDOW_P for the rep state RS from the current FSFS session's
+/* Read the WINDOW_P for the rep state RS from the current FSX session's
  * cache. This will be a no-op and IS_CACHED will be set to FALSE if no
  * cache has been given. If a cache is available IS_CACHED will inform
  * the caller about the success of the lookup. Allocations (of the window
@@ -999,7 +999,7 @@ get_cached_combined_window(svn_stringbuf
   return SVN_NO_ERROR;
 }
 
-/* Store the WINDOW read for the rep state RS in the current FSFS session's
+/* Store the WINDOW read for the rep state RS in the current FSX session's
  * cache. This will be a no-op if no cache has been given.
  * Temporary allocations will be made from SCRATCH_POOL. */
 static svn_error_t *
@@ -2085,7 +2085,7 @@ get_dir_contents(apr_hash_t *entries,
 
 
 /* Given a hash STR_ENTRIES with values as svn_string_t as specified
-   in an FSFS directory contents listing, return a hash of dirents in
+   in an FSX directory contents listing, return a hash of dirents in
    *ENTRIES_P.  Use ID to generate more helpful error messages.
    Perform allocations in POOL. */
 static svn_error_t *

Modified: subversion/branches/fsfs-format7/subversion/libsvn_fs_x/cached_data.h
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/libsvn_fs_x/cached_data.h?rev=1498684&r1=1498683&r2=1498684&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/libsvn_fs_x/cached_data.h (original)
+++ subversion/branches/fsfs-format7/subversion/libsvn_fs_x/cached_data.h Mon Jul  1 21:00:03 2013
@@ -1,4 +1,4 @@
-/* cached_data.h --- cached (read) access to FSFS data
+/* cached_data.h --- cached (read) access to FSX data
  *
  * ====================================================================
  *    Licensed to the Apache Software Foundation (ASF) under one

Modified: subversion/branches/fsfs-format7/subversion/libsvn_fs_x/caching.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/libsvn_fs_x/caching.c?rev=1498684&r1=1498683&r2=1498684&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/libsvn_fs_x/caching.c (original)
+++ subversion/branches/fsfs-format7/subversion/libsvn_fs_x/caching.c Mon Jul  1 21:00:03 2013
@@ -281,7 +281,7 @@ init_callbacks(svn_cache__t *cache,
 #ifdef SVN_DEBUG_CACHE_DUMP_STATS
 
       /* schedule printing the access statistics upon pool cleanup,
-       * i.e. end of FSFS session.
+       * i.e. end of FSX session.
        */
       struct dump_cache_baton_t *baton;
 
@@ -414,7 +414,7 @@ svn_fs_x__initialize_caches(svn_fs_t *fs
 #ifdef SVN_DEBUG_CACHE_DUMP_STATS
 
   /* schedule printing the global access statistics upon pool cleanup,
-    * i.e. end of FSFS session.
+    * i.e. end of FSX session.
     */
   if (membuffer)
     apr_pool_cleanup_register(pool,
@@ -826,7 +826,7 @@ svn_fs_x__initialize_txn_caches(svn_fs_t
                                    (char *)NULL);
 
   /* We don't support caching for concurrent transactions in the SAME
-   * FSFS session. Maybe, you forgot to clean POOL. */
+   * FSX session. Maybe, you forgot to clean POOL. */
   if (ffd->txn_dir_cache != NULL || ffd->concurrent_transactions)
     {
       ffd->txn_dir_cache = NULL;

Modified: subversion/branches/fsfs-format7/subversion/libsvn_fs_x/changes.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/libsvn_fs_x/changes.c?rev=1498684&r1=1498683&r2=1498684&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/libsvn_fs_x/changes.c (original)
+++ subversion/branches/fsfs-format7/subversion/libsvn_fs_x/changes.c Mon Jul  1 21:00:03 2013
@@ -1,4 +1,4 @@
-/* changes.h --- FSFS changed paths lists container
+/* changes.h --- FSX changed paths lists container
  *
  * ====================================================================
  *    Licensed to the Apache Software Foundation (ASF) under one
@@ -262,7 +262,7 @@ svn_fs_x__changes_get_list(apr_array_hea
       const binary_change_t *binary_change
         = &APR_ARRAY_IDX(changes->changes, i, binary_change_t);
 
-      /* convert BINARY_CHANGE into a standard FSFS change_t */
+      /* convert BINARY_CHANGE into a standard FSX change_t */
       change_t *change = apr_pcalloc(pool, sizeof(*change));
       svn_fs_path_change2_t *info = &change->info;
       change->path.data = svn_fs_x__string_table_get(changes->paths,
@@ -534,7 +534,7 @@ svn_fs_x__changes_get_list_func(void **o
     {
       const binary_change_t *binary_change = &changes[i];
 
-      /* convert BINARY_CHANGE into a standard FSFS change_t */
+      /* convert BINARY_CHANGE into a standard FSX change_t */
       change_t *change = apr_pcalloc(pool, sizeof(*change));
       svn_fs_path_change2_t *info = &change->info;
       change->path.data

Modified: subversion/branches/fsfs-format7/subversion/libsvn_fs_x/changes.h
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/libsvn_fs_x/changes.h?rev=1498684&r1=1498683&r2=1498684&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/libsvn_fs_x/changes.h (original)
+++ subversion/branches/fsfs-format7/subversion/libsvn_fs_x/changes.h Mon Jul  1 21:00:03 2013
@@ -1,4 +1,4 @@
-/* changes.h --- FSFS changed paths lists container
+/* changes.h --- FSX changed paths lists container
  *
  * ====================================================================
  *    Licensed to the Apache Software Foundation (ASF) under one

Modified: subversion/branches/fsfs-format7/subversion/libsvn_fs_x/fs.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/libsvn_fs_x/fs.c?rev=1498684&r1=1498683&r2=1498684&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/libsvn_fs_x/fs.c (original)
+++ subversion/branches/fsfs-format7/subversion/libsvn_fs_x/fs.c Mon Jul  1 21:00:03 2013
@@ -120,7 +120,7 @@ x_serialized_init(svn_fs_t *fs, apr_pool
 
 
 /* This function is provided for Subversion 1.0.x compatibility.  It
-   has no effect for fsfs backed Subversion filesystems.  It conforms
+   has no effect for fsx backed Subversion filesystems.  It conforms
    to the fs_library_vtable_t.bdb_set_errcall() API. */
 static svn_error_t *
 x_set_errcall(svn_fs_t *fs,
@@ -227,7 +227,7 @@ initialize_fs_struct(svn_fs_t *fs)
 }
 
 /* This implements the fs_library_vtable_t.create() API.  Create a new
-   fsfs-backed Subversion filesystem at path PATH and link it into
+   fsx-backed Subversion filesystem at path PATH and link it into
    *FS.  Perform temporary allocations in POOL, and fs-global allocations
    in COMMON_POOL. */
 static svn_error_t *
@@ -248,7 +248,7 @@ x_create(svn_fs_t *fs, const char *path,
 
 /* Gaining access to an existing filesystem.  */
 
-/* This implements the fs_library_vtable_t.open() API.  Open an FSFS
+/* This implements the fs_library_vtable_t.open() API.  Open an FSX
    Subversion filesystem located at PATH, set *FS to point to the
    correct vtable for the filesystem.  Use POOL for any temporary
    allocations, and COMMON_POOL for fs-global allocations. */
@@ -272,7 +272,7 @@ x_open_for_recovery(svn_fs_t *fs,
                     const char *path,
                     apr_pool_t *pool, apr_pool_t *common_pool)
 {
-  /* Recovery for FSFS is currently limited to recreating the 'current'
+  /* Recovery for FSX is currently limited to recreating the 'current'
      file from the latest revision. */
 
   /* The only thing we have to watch out for is that the 'current' file
@@ -391,7 +391,7 @@ x_hotcopy(svn_fs_t *src_fs,
 
 
 /* This function is included for Subversion 1.0.x compatibility.  It
-   has no effect for fsfs backed Subversion filesystems.  It conforms
+   has no effect for fsx backed Subversion filesystems.  It conforms
    to the fs_library_vtable_t.bdb_logfiles() API. */
 static svn_error_t *
 x_logfiles(apr_array_header_t **logfiles,

Modified: subversion/branches/fsfs-format7/subversion/libsvn_fs_x/fs.h
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/libsvn_fs_x/fs.h?rev=1498684&r1=1498683&r2=1498684&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/libsvn_fs_x/fs.h (original)
+++ subversion/branches/fsfs-format7/subversion/libsvn_fs_x/fs.h Mon Jul  1 21:00:03 2013
@@ -50,7 +50,7 @@ extern "C" {
 /* Following are defines that specify the textual elements of the
    native filesystem directories and revision files. */
 
-/* Names of special files in the fs_fs filesystem. */
+/* Names of special files in the fs_x filesystem. */
 #define PATH_FORMAT           "format"           /* Contains format number */
 #define PATH_UUID             "uuid"             /* Contains UUID */
 #define PATH_CURRENT          "current"          /* Youngest revision */
@@ -96,7 +96,7 @@ extern "C" {
 #define PATH_REV           "rev"           /* Proto rev file */
 #define PATH_REV_LOCK      "rev-lock"      /* Proto rev (write) lock file */
 
-/* Names of sections and options in fsfs.conf. */
+/* Names of sections and options in fsx.conf. */
 #define CONFIG_SECTION_CACHES            "caches"
 #define CONFIG_OPTION_FAIL_STOP          "fail-stop"
 #define CONFIG_SECTION_REP_SHARING       "rep-sharing"
@@ -119,7 +119,7 @@ extern "C" {
    independent of any other FS back ends. */
 #define SVN_FS_X__FORMAT_NUMBER   1
 
-/* Private FSFS-specific data shared between all svn_txn_t objects that
+/* Private FSX-specific data shared between all svn_txn_t objects that
    relate to a particular transaction in a filesystem (as identified
    by transaction id and filesystem UUID).  Objects of this type are
    allocated in their own subpool of the common pool. */
@@ -154,7 +154,7 @@ typedef struct fs_x_shared_txn_data_t
 #define SVN_FS_X__USE_LOCK_MUTEX 0
 #endif
 
-/* Private FSFS-specific data shared between all svn_fs_t objects that
+/* Private FSX-specific data shared between all svn_fs_t objects that
    relate to a particular filesystem, as identified by filesystem UUID.
    Objects of this type are allocated in the common pool. */
 typedef struct fs_x_shared_data_t
@@ -222,7 +222,7 @@ typedef struct window_cache_key_t
   apr_uint64_t item_index;
 } window_cache_key_t;
 
-/* Private (non-shared) FSFS-specific data for each svn_fs_t object.
+/* Private (non-shared) FSX-specific data for each svn_fs_t object.
    Any caches in here may be NULL. */
 typedef struct fs_x_data_t
 {
@@ -244,7 +244,7 @@ typedef struct fs_x_data_t
   /* The revision that was youngest, last time we checked. */
   svn_revnum_t youngest_rev_cache;
 
-  /* The fsfs.conf file, parsed.  Allocated in FS->pool. */
+  /* The fsx.conf file, parsed.  Allocated in FS->pool. */
   svn_config_t *config;
 
   /* Caches of immutable data.  (Note that if these are created with
@@ -372,7 +372,7 @@ typedef struct fs_x_data_t
   svn_atomic_t rep_cache_db_opened;
 
   /* The oldest revision not in a pack file.  It also applies to revprops
-   * if revprop packing has been enabled by the FSFS format version. */
+   * if revprop packing has been enabled by the FSX format version. */
   svn_revnum_t min_unpacked_rev;
 
   /* Whether rep-sharing is supported by the filesystem

Modified: subversion/branches/fsfs-format7/subversion/libsvn_fs_x/fs_x.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/libsvn_fs_x/fs_x.c?rev=1498684&r1=1498683&r2=1498684&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/libsvn_fs_x/fs_x.c (original)
+++ subversion/branches/fsfs-format7/subversion/libsvn_fs_x/fs_x.c Mon Jul  1 21:00:03 2013
@@ -1,4 +1,4 @@
-/* fs_fs.c --- filesystem operations specific to fs_fs
+/* fs_x.c --- filesystem operations specific to fs_x
  *
  * ====================================================================
  *    Licensed to the Apache Software Foundation (ASF) under one

Modified: subversion/branches/fsfs-format7/subversion/libsvn_fs_x/fs_x.h
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/libsvn_fs_x/fs_x.h?rev=1498684&r1=1498683&r2=1498684&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/libsvn_fs_x/fs_x.h (original)
+++ subversion/branches/fsfs-format7/subversion/libsvn_fs_x/fs_x.h Mon Jul  1 21:00:03 2013
@@ -1,4 +1,4 @@
-/* fs_fs.h : interface to the native filesystem layer
+/* fs_x.h : interface to the native filesystem layer
  *
  * ====================================================================
  *    Licensed to the Apache Software Foundation (ASF) under one
@@ -25,7 +25,7 @@
 
 #include "fs.h"
 
-/* Open the fsfs filesystem pointed to by PATH and associate it with
+/* Open the fsx filesystem pointed to by PATH and associate it with
    filesystem object FS.  Use POOL for temporary allocations.
 
    ### Some parts of *FS must have been initialized beforehand; some parts
@@ -34,7 +34,7 @@ svn_error_t *svn_fs_x__open(svn_fs_t *fs
                             const char *path,
                             apr_pool_t *pool);
 
-/* Upgrade the fsfs filesystem FS.  Indicate progress via the optional
+/* Upgrade the fsx filesystem FS.  Indicate progress via the optional
  * NOTIFY_FUNC callback using NOTIFY_BATON.  The optional CANCEL_FUNC
  * will periodically be called with CANCEL_BATON to allow for preemption.
  * Use POOL for temporary allocations. */
@@ -107,7 +107,7 @@ svn_error_t *svn_fs_x__file_checksum(svn
                                      svn_checksum_kind_t kind,
                                      apr_pool_t *pool);
 
-/* Create a fs_fs fileysystem referenced by FS at path PATH.  Get any
+/* Create a fs_x fileysystem referenced by FS at path PATH.  Get any
    temporary allocations from POOL.
 
    ### Some parts of *FS must have been initialized beforehand; some parts

Modified: subversion/branches/fsfs-format7/subversion/libsvn_fs_x/hotcopy.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/libsvn_fs_x/hotcopy.c?rev=1498684&r1=1498683&r2=1498684&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/libsvn_fs_x/hotcopy.c (original)
+++ subversion/branches/fsfs-format7/subversion/libsvn_fs_x/hotcopy.c Mon Jul  1 21:00:03 2013
@@ -1,4 +1,4 @@
-/* hotcopys.c --- FS hotcopy functionality for FSFS
+/* hotcopys.c --- FS hotcopy functionality for FSX
  *
  * ====================================================================
  *    Licensed to the Apache Software Foundation (ASF) under one
@@ -521,7 +521,7 @@ hotcopy_body(void *baton, apr_pool_t *po
         {
           /* 1.6.0 to 1.6.11 did not copy the configuration file during
             * hotcopy. So if we're hotcopying a repository which has been
-            * created as a hotcopy itself, it's possible that fsfs.conf
+            * created as a hotcopy itself, it's possible that fsx.conf
             * does not exist. Ask the user to re-create it.
             *
             * ### It would be nice to make this a non-fatal error,

Modified: subversion/branches/fsfs-format7/subversion/libsvn_fs_x/hotcopy.h
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/libsvn_fs_x/hotcopy.h?rev=1498684&r1=1498683&r2=1498684&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/libsvn_fs_x/hotcopy.h (original)
+++ subversion/branches/fsfs-format7/subversion/libsvn_fs_x/hotcopy.h Mon Jul  1 21:00:03 2013
@@ -25,7 +25,7 @@
 
 #include "fs.h"
 
-/* Copy the fsfs filesystem SRC_FS at SRC_PATH into a new copy DST_FS at
+/* Copy the fsx filesystem SRC_FS at SRC_PATH into a new copy DST_FS at
  * DST_PATH. If INCREMENTAL is TRUE, do not re-copy data which already
  * exists in DST_FS. Use POOL for temporary allocations. */
 svn_error_t * svn_fs_x__hotcopy(svn_fs_t *src_fs,

Modified: subversion/branches/fsfs-format7/subversion/libsvn_fs_x/id.h
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/libsvn_fs_x/id.h?rev=1498684&r1=1498683&r2=1498684&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/libsvn_fs_x/id.h (original)
+++ subversion/branches/fsfs-format7/subversion/libsvn_fs_x/id.h Mon Jul  1 21:00:03 2013
@@ -1,4 +1,4 @@
-/* id.h : interface to node ID functions, private to libsvn_fs_fs
+/* id.h : interface to node ID functions, private to libsvn_fs_x
  *
  * ====================================================================
  *    Licensed to the Apache Software Foundation (ASF) under one
@@ -29,7 +29,7 @@
 extern "C" {
 #endif /* __cplusplus */
 
-/* A rev node ID in FSFS consists of a 3 of sub-IDs ("parts") that consist
+/* A rev node ID in FSX consists of a 3 of sub-IDs ("parts") that consist
  * of a creation REVISION number and some revision-local counter value
  * (NUMBER).  Old-style ID parts use global counter values.
  */

Modified: subversion/branches/fsfs-format7/subversion/libsvn_fs_x/index.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/libsvn_fs_x/index.c?rev=1498684&r1=1498683&r2=1498684&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/libsvn_fs_x/index.c (original)
+++ subversion/branches/fsfs-format7/subversion/libsvn_fs_x/index.c Mon Jul  1 21:00:03 2013
@@ -1,4 +1,4 @@
-/* index.c indexing support for FSFS support
+/* index.c indexing support for FSX support
  *
  * ====================================================================
  *    Licensed to the Apache Software Foundation (ASF) under one

Modified: subversion/branches/fsfs-format7/subversion/libsvn_fs_x/index.h
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/libsvn_fs_x/index.h?rev=1498684&r1=1498683&r2=1498684&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/libsvn_fs_x/index.h (original)
+++ subversion/branches/fsfs-format7/subversion/libsvn_fs_x/index.h Mon Jul  1 21:00:03 2013
@@ -1,4 +1,4 @@
-/* index.h : interface to FSFS indexing functionality
+/* index.h : interface to FSX indexing functionality
  *
  * ====================================================================
  *    Licensed to the Apache Software Foundation (ASF) under one

Modified: subversion/branches/fsfs-format7/subversion/libsvn_fs_x/lock.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/libsvn_fs_x/lock.c?rev=1498684&r1=1498683&r2=1498684&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/libsvn_fs_x/lock.c (original)
+++ subversion/branches/fsfs-format7/subversion/libsvn_fs_x/lock.c Mon Jul  1 21:00:03 2013
@@ -710,7 +710,7 @@ get_locks_callback(void *baton,
 }
 
 
-/* The main routine for lock enforcement, used throughout libsvn_fs_fs. */
+/* The main routine for lock enforcement, used throughout libsvn_fs_x. */
 svn_error_t *
 svn_fs_x__allow_locked_operation(const char *path,
                                  svn_fs_t *fs,
@@ -832,7 +832,7 @@ lock_body(void *baton, apr_pool_t *pool)
      not existing as a key, the lock just having been expired}.  And
      that's totally fine.  Any of these three errors are perfectly
      acceptable to ignore; it means that the path is now free and
-     clear for locking, because the fsfs funcs just cleared out both
+     clear for locking, because the fsx funcs just cleared out both
      of the tables for us.   */
   SVN_ERR(get_lock_helper(lb->fs, &existing_lock, lb->path, TRUE, pool));
   if (existing_lock)
@@ -1013,7 +1013,7 @@ typedef struct get_locks_filter_baton_t
    BATON->requested_depth of BATON->path before called
    BATON->get_locks_func() with BATON->get_locks_baton.
 
-   NOTE: See issue #3660 for details about how the FSFS lock
+   NOTE: See issue #3660 for details about how the FSX lock
    management code is inconsistent.  Until that inconsistency is
    resolved, we take this filtering approach rather than honoring
    depth requests closer to the crawling code.  In other words, once

Modified: subversion/branches/fsfs-format7/subversion/libsvn_fs_x/low_level.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/libsvn_fs_x/low_level.c?rev=1498684&r1=1498683&r2=1498684&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/libsvn_fs_x/low_level.c (original)
+++ subversion/branches/fsfs-format7/subversion/libsvn_fs_x/low_level.c Mon Jul  1 21:00:03 2013
@@ -1,4 +1,4 @@
-/* low_level.c --- low level r/w access to fs_fs file structures
+/* low_level.c --- low level r/w access to fs_x file structures
  *
  * ====================================================================
  *    Licensed to the Apache Software Foundation (ASF) under one
@@ -966,7 +966,7 @@ svn_fs_x__write_changes(svn_stream_t *st
 
   /* For the sake of the repository administrator sort the changes so
      that the final file is deterministic and repeatable, however the
-     rest of the FSFS code doesn't require any particular order here. */
+     rest of the FSX code doesn't require any particular order here. */
   sorted_changed_paths = svn_sort__hash(changes,
                                         svn_sort_compare_items_lexically, pool);
 

Modified: subversion/branches/fsfs-format7/subversion/libsvn_fs_x/low_level.h
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/libsvn_fs_x/low_level.h?rev=1498684&r1=1498683&r2=1498684&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/libsvn_fs_x/low_level.h (original)
+++ subversion/branches/fsfs-format7/subversion/libsvn_fs_x/low_level.h Mon Jul  1 21:00:03 2013
@@ -1,4 +1,4 @@
-/* low_level.c --- low level r/w access to fs_fs file structures
+/* low_level.c --- low level r/w access to fs_x file structures
  *
  * ====================================================================
  *    Licensed to the Apache Software Foundation (ASF) under one

Modified: subversion/branches/fsfs-format7/subversion/libsvn_fs_x/noderevs.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/libsvn_fs_x/noderevs.c?rev=1498684&r1=1498683&r2=1498684&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/libsvn_fs_x/noderevs.c (original)
+++ subversion/branches/fsfs-format7/subversion/libsvn_fs_x/noderevs.c Mon Jul  1 21:00:03 2013
@@ -1,4 +1,4 @@
-/* noderevs.h --- FSFS node revision container
+/* noderevs.h --- FSX node revision container
  *
  * ====================================================================
  *    Licensed to the Apache Software Foundation (ASF) under one

Modified: subversion/branches/fsfs-format7/subversion/libsvn_fs_x/noderevs.h
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/libsvn_fs_x/noderevs.h?rev=1498684&r1=1498683&r2=1498684&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/libsvn_fs_x/noderevs.h (original)
+++ subversion/branches/fsfs-format7/subversion/libsvn_fs_x/noderevs.h Mon Jul  1 21:00:03 2013
@@ -1,4 +1,4 @@
-/* noderevs.h --- FSFS node revision container
+/* noderevs.h --- FSX node revision container
  *
  * ====================================================================
  *    Licensed to the Apache Software Foundation (ASF) under one

Modified: subversion/branches/fsfs-format7/subversion/libsvn_fs_x/pack.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/libsvn_fs_x/pack.c?rev=1498684&r1=1498683&r2=1498684&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/libsvn_fs_x/pack.c (original)
+++ subversion/branches/fsfs-format7/subversion/libsvn_fs_x/pack.c Mon Jul  1 21:00:03 2013
@@ -1,4 +1,4 @@
-/* pack.c --- FSFS shard packing functionality
+/* pack.c --- FSX shard packing functionality
  *
  * ====================================================================
  *    Licensed to the Apache Software Foundation (ASF) under one

Modified: subversion/branches/fsfs-format7/subversion/libsvn_fs_x/pack.h
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/libsvn_fs_x/pack.h?rev=1498684&r1=1498683&r2=1498684&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/libsvn_fs_x/pack.h (original)
+++ subversion/branches/fsfs-format7/subversion/libsvn_fs_x/pack.h Mon Jul  1 21:00:03 2013
@@ -1,4 +1,4 @@
-/* pack.h : interface FSFS pack functionality
+/* pack.h : interface FSX pack functionality
  *
  * ====================================================================
  *    Licensed to the Apache Software Foundation (ASF) under one

Modified: subversion/branches/fsfs-format7/subversion/libsvn_fs_x/recovery.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/libsvn_fs_x/recovery.c?rev=1498684&r1=1498683&r2=1498684&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/libsvn_fs_x/recovery.c (original)
+++ subversion/branches/fsfs-format7/subversion/libsvn_fs_x/recovery.c Mon Jul  1 21:00:03 2013
@@ -1,4 +1,4 @@
-/* recovery.c --- FSFS recovery functionality
+/* recovery.c --- FSX recovery functionality
 *
  * ====================================================================
  *    Licensed to the Apache Software Foundation (ASF) under one
@@ -155,7 +155,7 @@ recover_body(void *baton, apr_pool_t *po
      list, looking in particular working copies, etc.
 
      This policy matches well with a typical naive backup scenario.
-     Say you're rsyncing your FSFS repository nightly to the same
+     Say you're rsyncing your FSX repository nightly to the same
      location.  Once revs and revprops are written, you've got the
      maximum rev; if the backup should bomb before db/current is
      written, then db/current could stay arbitrarily out-of-date, but
@@ -227,7 +227,7 @@ svn_fs_x__recover(svn_fs_t *fs,
 {
   struct recover_baton b;
 
-  /* We have no way to take out an exclusive lock in FSFS, so we're
+  /* We have no way to take out an exclusive lock in FSX, so we're
      restricted as to the types of recovery we can do.  Luckily,
      we just want to recreate the 'current' file, and we can do that just
      by blocking other writers. */

Modified: subversion/branches/fsfs-format7/subversion/libsvn_fs_x/recovery.h
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/libsvn_fs_x/recovery.h?rev=1498684&r1=1498683&r2=1498684&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/libsvn_fs_x/recovery.h (original)
+++ subversion/branches/fsfs-format7/subversion/libsvn_fs_x/recovery.h Mon Jul  1 21:00:03 2013
@@ -1,4 +1,4 @@
-/* recovery.h : interface to the FSFS recovery functionality
+/* recovery.h : interface to the FSX recovery functionality
  *
  * ====================================================================
  *    Licensed to the Apache Software Foundation (ASF) under one
@@ -25,7 +25,7 @@
 
 #include "fs.h"
 
-/* Recover the fsfs associated with filesystem FS.
+/* Recover the fsx associated with filesystem FS.
    Use optional CANCEL_FUNC/CANCEL_BATON for cancellation support.
    Use POOL for temporary allocations. */
 svn_error_t *svn_fs_x__recover(svn_fs_t *fs,

Modified: subversion/branches/fsfs-format7/subversion/libsvn_fs_x/rep-cache.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/libsvn_fs_x/rep-cache.c?rev=1498684&r1=1498683&r2=1498684&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/libsvn_fs_x/rep-cache.c (original)
+++ subversion/branches/fsfs-format7/subversion/libsvn_fs_x/rep-cache.c Mon Jul  1 21:00:03 2013
@@ -1,4 +1,4 @@
-/* rep-sharing.c --- the rep-sharing cache for fsfs
+/* rep-sharing.c --- the rep-sharing cache for fsx
  *
  * ====================================================================
  *    Licensed to the Apache Software Foundation (ASF) under one

Modified: subversion/branches/fsfs-format7/subversion/libsvn_fs_x/reps.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/libsvn_fs_x/reps.c?rev=1498684&r1=1498683&r2=1498684&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/libsvn_fs_x/reps.c (original)
+++ subversion/branches/fsfs-format7/subversion/libsvn_fs_x/reps.c Mon Jul  1 21:00:03 2013
@@ -1,4 +1,4 @@
-/* reps.c --- FSFS representation container
+/* reps.c --- FSX representation container
  *
  * ====================================================================
  *    Licensed to the Apache Software Foundation (ASF) under one

Modified: subversion/branches/fsfs-format7/subversion/libsvn_fs_x/reps.h
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/libsvn_fs_x/reps.h?rev=1498684&r1=1498683&r2=1498684&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/libsvn_fs_x/reps.h (original)
+++ subversion/branches/fsfs-format7/subversion/libsvn_fs_x/reps.h Mon Jul  1 21:00:03 2013
@@ -1,4 +1,4 @@
-/* reps.h --- FSFS representation container
+/* reps.h --- FSX representation container
  *
  * ====================================================================
  *    Licensed to the Apache Software Foundation (ASF) under one

Modified: subversion/branches/fsfs-format7/subversion/libsvn_fs_x/revprops.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/libsvn_fs_x/revprops.c?rev=1498684&r1=1498683&r2=1498684&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/libsvn_fs_x/revprops.c (original)
+++ subversion/branches/fsfs-format7/subversion/libsvn_fs_x/revprops.c Mon Jul  1 21:00:03 2013
@@ -1,4 +1,4 @@
-/* revprops.c --- everything needed to handle revprops in FSFS
+/* revprops.c --- everything needed to handle revprops in FSX
  *
  * ====================================================================
  *    Licensed to the Apache Software Foundation (ASF) under one
@@ -1490,7 +1490,7 @@ svn_fs_x__packed_revprop_available(svn_b
 }
 
 
-/****** Packing FSFS shards *********/
+/****** Packing FSX shards *********/
 
 /* Copy revprop files for revisions [START_REV, END_REV) from SHARD_PATH
  * to the pack file at PACK_FILE_NAME in PACK_FILE_DIR.

Modified: subversion/branches/fsfs-format7/subversion/libsvn_fs_x/revprops.h
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/libsvn_fs_x/revprops.h?rev=1498684&r1=1498683&r2=1498684&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/libsvn_fs_x/revprops.h (original)
+++ subversion/branches/fsfs-format7/subversion/libsvn_fs_x/revprops.h Mon Jul  1 21:00:03 2013
@@ -1,4 +1,4 @@
-/* revprops.h --- everything needed to handle revprops in FSFS
+/* revprops.h --- everything needed to handle revprops in FSX
  *
  * ====================================================================
  *    Licensed to the Apache Software Foundation (ASF) under one
@@ -99,7 +99,7 @@ svn_fs_x__packed_revprop_available(svn_b
                                    apr_pool_t *pool);
 
 
-/****** Packing FSFS shards *********/
+/****** Packing FSX shards *********/
 
 /* Copy revprop files for revisions [START_REV, END_REV) from SHARD_PATH
  * to the pack file at PACK_FILE_NAME in PACK_FILE_DIR.

Modified: subversion/branches/fsfs-format7/subversion/libsvn_fs_x/string_table.h
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/libsvn_fs_x/string_table.h?rev=1498684&r1=1498683&r2=1498684&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/libsvn_fs_x/string_table.h (original)
+++ subversion/branches/fsfs-format7/subversion/libsvn_fs_x/string_table.h Mon Jul  1 21:00:03 2013
@@ -1,4 +1,4 @@
-/* string_table.h : interface to string tables, private to libsvn_fs_fs
+/* string_table.h : interface to string tables, private to libsvn_fs_x
  *
  * ====================================================================
  *    Licensed to the Apache Software Foundation (ASF) under one
@@ -37,7 +37,7 @@ extern "C" {
  * stuff all the strings in there and let it then do the heavy lifting of
  * classification and compression to create the actual string table object.
  *
- * We will use this for the various path values in FSFS change lists and
+ * We will use this for the various path values in FSX change lists and
  * node revision items.
  */
 

Modified: subversion/branches/fsfs-format7/subversion/libsvn_fs_x/temp_serializer.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/libsvn_fs_x/temp_serializer.c?rev=1498684&r1=1498683&r2=1498684&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/libsvn_fs_x/temp_serializer.c (original)
+++ subversion/branches/fsfs-format7/subversion/libsvn_fs_x/temp_serializer.c Mon Jul  1 21:00:03 2013
@@ -1,4 +1,4 @@
-/* temp_serializer.c: serialization functions for caching of FSFS structures
+/* temp_serializer.c: serialization functions for caching of FSX structures
  *
  * ====================================================================
  *    Licensed to the Apache Software Foundation (ASF) under one

Modified: subversion/branches/fsfs-format7/subversion/libsvn_fs_x/temp_serializer.h
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/libsvn_fs_x/temp_serializer.h?rev=1498684&r1=1498683&r2=1498684&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/libsvn_fs_x/temp_serializer.h (original)
+++ subversion/branches/fsfs-format7/subversion/libsvn_fs_x/temp_serializer.h Mon Jul  1 21:00:03 2013
@@ -1,4 +1,4 @@
-/* temp_serializer.h : serialization functions for caching of FSFS structures
+/* temp_serializer.h : serialization functions for caching of FSX structures
  *
  * ====================================================================
  *    Licensed to the Apache Software Foundation (ASF) under one

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=1498684&r1=1498683&r2=1498684&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 21:00:03 2013
@@ -1,4 +1,4 @@
-/* transaction.c --- transaction-related functions of FSFS
+/* transaction.c --- transaction-related functions of FSX
  *
  * ====================================================================
  *    Licensed to the Apache Software Foundation (ASF) under one
@@ -60,7 +60,7 @@ static txn_vtable_t txn_vtable = {
   svn_fs_x__change_txn_props
 };
 
-/* FSFS-specific data being attached to svn_fs_txn_t.
+/* FSX-specific data being attached to svn_fs_txn_t.
  */
 typedef struct fs_txn_data_t
 {
@@ -612,7 +612,7 @@ unparse_dir_entry(svn_node_kind_t kind, 
 
 /* Given a hash ENTRIES of dirent structions, return a hash in
    *STR_ENTRIES_P, that has svn_string_t as the values in the format
-   specified by the fs_fs directory contents file.  Perform
+   specified by the fs_x directory contents file.  Perform
    allocations in POOL. */
 static svn_error_t *
 unparse_dir_entries(apr_hash_t **str_entries_p,
@@ -2583,7 +2583,7 @@ write_final_rev(const svn_fs_id_t **new_
       SVN_ERR(svn_fs_x__rep_contents_dir(&entries, fs, noderev, pool));
       /* For the sake of the repository administrator sort the entries
          so that the final file is deterministic and repeatable,
-         however the rest of the FSFS code doesn't require any
+         however the rest of the FSX code doesn't require any
          particular order here. */
       sorted_entries = svn_sort__hash(entries, svn_sort_compare_items_lexically,
                                       pool);

Modified: subversion/branches/fsfs-format7/subversion/libsvn_fs_x/transaction.h
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/libsvn_fs_x/transaction.h?rev=1498684&r1=1498683&r2=1498684&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/libsvn_fs_x/transaction.h (original)
+++ subversion/branches/fsfs-format7/subversion/libsvn_fs_x/transaction.h Mon Jul  1 21:00:03 2013
@@ -1,4 +1,4 @@
-/* transaction.h --- transaction-related functions of FSFS
+/* transaction.h --- transaction-related functions of FSX
  *
  * ====================================================================
  *    Licensed to the Apache Software Foundation (ASF) under one

Modified: subversion/branches/fsfs-format7/subversion/libsvn_fs_x/tree.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/libsvn_fs_x/tree.c?rev=1498684&r1=1498683&r2=1498684&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/libsvn_fs_x/tree.c (original)
+++ subversion/branches/fsfs-format7/subversion/libsvn_fs_x/tree.c Mon Jul  1 21:00:03 2013
@@ -2171,7 +2171,7 @@ svn_fs_x__deltify(svn_fs_t *fs,
                   svn_revnum_t revision,
                   apr_pool_t *pool)
 {
-  /* Deltify is a no-op for fs_fs. */
+  /* Deltify is a no-op for fs_x. */
 
   return SVN_NO_ERROR;
 }
@@ -2209,7 +2209,7 @@ x_dir_optimal_order(apr_array_header_t *
   return SVN_NO_ERROR;
 }
 
-/* Raise an error if PATH contains a newline because FSFS cannot handle
+/* Raise an error if PATH contains a newline because FSX cannot handle
  * such paths. See issue #4340. */
 static svn_error_t *
 check_newline(const char *path, apr_pool_t *pool)
@@ -2335,7 +2335,7 @@ x_delete_node(svn_fs_root_t *root,
 
 /* Set *SAME_P to TRUE if FS1 and FS2 have the same UUID, else set to FALSE.
    Use POOL for temporary allocation only.
-   Note: this code is duplicated between libsvn_fs_fs and libsvn_fs_base. */
+   Note: this code is duplicated between libsvn_fs_x and libsvn_fs_base. */
 static svn_error_t *
 x_same_p(svn_boolean_t *same_p,
          svn_fs_t *fs1,
@@ -4315,7 +4315,7 @@ svn_fs_x__verify_root(svn_fs_root_t *roo
      (and elsewhere).  This code makes more thorough checks than the
      commit-time checks in validate_root_noderev(). */
 
-  /* Callers should disable caches by setting SVN_FS_CONFIG_FSFS_CACHE_NS;
+  /* Callers should disable caches by setting SVN_FS_CONFIG_FSX_CACHE_NS;
      see r1462436.
 
      When this code is called in the library, we want to ensure we

Modified: subversion/branches/fsfs-format7/subversion/libsvn_fs_x/util.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/libsvn_fs_x/util.c?rev=1498684&r1=1498683&r2=1498684&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/libsvn_fs_x/util.c (original)
+++ subversion/branches/fsfs-format7/subversion/libsvn_fs_x/util.c Mon Jul  1 21:00:03 2013
@@ -1,4 +1,4 @@
-/* util.c --- utility functions for FSFS repo access
+/* util.c --- utility functions for FSX repo access
  *
  * ====================================================================
  *    Licensed to the Apache Software Foundation (ASF) under one

Modified: subversion/branches/fsfs-format7/subversion/libsvn_fs_x/util.h
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/libsvn_fs_x/util.h?rev=1498684&r1=1498683&r2=1498684&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/libsvn_fs_x/util.h (original)
+++ subversion/branches/fsfs-format7/subversion/libsvn_fs_x/util.h Mon Jul  1 21:00:03 2013
@@ -1,4 +1,4 @@
-/* util.h --- utility functions for FSFS repo access
+/* util.h --- utility functions for FSX repo access
  *
  * ====================================================================
  *    Licensed to the Apache Software Foundation (ASF) under one
@@ -29,7 +29,7 @@
 /* Functions for dealing with recoverable errors on mutable files
  *
  * Revprops, current, and txn-current files are mutable; that is, they
- * change as part of normal fsfs operation, in constrat to revs files, or
+ * change as part of normal fsx operation, in constrat to revs files, or
  * the format file, which are written once at create (or upgrade) time.
  * When more than one host writes to the same repository, we will
  * sometimes see these recoverable errors when accesssing these files.

Modified: subversion/branches/fsfs-format7/subversion/libsvn_fs_x/verify.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/libsvn_fs_x/verify.c?rev=1498684&r1=1498683&r2=1498684&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/libsvn_fs_x/verify.c (original)
+++ subversion/branches/fsfs-format7/subversion/libsvn_fs_x/verify.c Mon Jul  1 21:00:03 2013
@@ -1,4 +1,4 @@
-/* verify.c --- verification of FSFS filesystems
+/* verify.c --- verification of FSX filesystems
  *
  * ====================================================================
  *    Licensed to the Apache Software Foundation (ASF) under one

Modified: subversion/branches/fsfs-format7/subversion/libsvn_fs_x/verify.h
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/libsvn_fs_x/verify.h?rev=1498684&r1=1498683&r2=1498684&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/libsvn_fs_x/verify.h (original)
+++ subversion/branches/fsfs-format7/subversion/libsvn_fs_x/verify.h Mon Jul  1 21:00:03 2013
@@ -25,7 +25,7 @@
 
 #include "fs.h"
 
-/* Verify metadata in fsfs filesystem FS.  Limit the checks to revisions
+/* Verify metadata in fsx filesystem FS.  Limit the checks to revisions
  * START to END where possible.  Indicate progress via the optional
  * NOTIFY_FUNC callback using NOTIFY_BATON.  The optional CANCEL_FUNC
  * will periodically be called with CANCEL_BATON to allow for preemption.



Mime
View raw message