Author: ivan
Date: Mon Jul 22 11:40:38 2013
New Revision: 1505664
URL: http://svn.apache.org/r1505664
Log:
Follow-up to r1504951: restore accidentally removed form feed characters.
* subversion/include/svn_fs.h
* subversion/libsvn_fs_base/dag.c
(): Restore form feed characters.
Modified:
subversion/trunk/subversion/include/svn_fs.h
subversion/trunk/subversion/libsvn_fs_base/dag.c
Modified: subversion/trunk/subversion/include/svn_fs.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_fs.h?rev=1505664&r1=1505663&r2=1505664&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_fs.h (original)
+++ subversion/trunk/subversion/include/svn_fs.h Mon Jul 22 11:40:38 2013
@@ -45,8 +45,7 @@
extern "C" {
#endif /* __cplusplus */
-
-
+
/**
* Get libsvn_fs version information.
*
@@ -176,8 +175,7 @@ typedef struct svn_fs_t svn_fs_t;
*/
svn_error_t *
svn_fs_initialize(apr_pool_t *pool);
-
-
+
/** The type of a warning callback function. @a baton is the value specified
* in the call to svn_fs_set_warning_func(); the filesystem passes it through
@@ -203,8 +201,7 @@ svn_fs_set_warning_func(svn_fs_t *fs,
svn_fs_warning_callback_t warning,
void *warning_baton);
-
-
+
/**
* Create a new, empty Subversion filesystem, stored in the directory
@@ -638,8 +635,7 @@ svn_fs_berkeley_recover(const char *path
/** @} */
-
-
+
/** Filesystem Access Contexts.
*
* @since New in 1.2.
@@ -726,8 +722,7 @@ svn_fs_access_add_lock_token(svn_fs_acce
/** @} */
-
-
+
/** Filesystem Nodes and Node-Revisions.
*
* In a Subversion filesystem, a `node' corresponds roughly to an
@@ -818,8 +813,7 @@ svn_fs_unparse_id(const svn_fs_id_t *id,
/** @} */
-
-
+
/** Filesystem Transactions.
*
* To make a change to a Subversion filesystem:
@@ -995,9 +989,6 @@ svn_fs_begin_txn(svn_fs_txn_t **txn_p,
* the conflict in @a txn, allocated within @a pool;
* otherwise, set @a *conflict_p to NULL.
*
- * If @ set_timestamp is non-zero 'svn:date' revision property will be updated
- * to current time to ensure that svn:date revprops remain ordered.
- *
* If the commit succeeds, @a txn is invalid.
*
* If the commit fails for any reason, @a *new_rev is an invalid
@@ -1168,8 +1159,7 @@ svn_fs_change_txn_props(svn_fs_txn_t *tx
/** @} */
-
-
+
/** Roots.
*
* An #svn_fs_root_t object represents the root directory of some
@@ -1253,8 +1243,7 @@ svn_fs_revision_root_revision(svn_fs_roo
/** @} */
-
-
+
/** Directory entry names and directory paths.
*
* Here are the rules for directory entry names, and directory paths:
@@ -1282,8 +1271,7 @@ svn_fs_revision_root_revision(svn_fs_roo
*/
-
-
+
/** The kind of change that occurred on the path. */
typedef enum svn_fs_path_change_kind_t
{
@@ -1412,8 +1400,7 @@ svn_fs_paths_changed(apr_hash_t **change
/** @} */
-
-
+
/* Operations appropriate to all kinds of nodes. */
/** Set @a *kind_p to the type of node present at @a path under @a
@@ -1790,8 +1777,7 @@ svn_fs_merge(const char **conflict_p,
apr_pool_t *pool);
-
-
+
/* Directories. */
@@ -1896,8 +1882,7 @@ svn_fs_revision_link(svn_fs_root_t *from
svn_fs_root_t *to_root,
const char *path,
apr_pool_t *pool);
-
-
+
/* Files. */
/** Set @a *length_p to the length of the file @a path in @a root, in bytes.
@@ -2131,8 +2116,7 @@ svn_fs_contents_changed(svn_boolean_t *c
apr_pool_t *pool);
-
-
+
/* Filesystem revisions. */
@@ -2265,8 +2249,7 @@ svn_fs_change_rev_prop(svn_fs_t *fs,
apr_pool_t *pool);
-
-
+
/* Computing deltas. */
@@ -2288,8 +2271,7 @@ svn_fs_get_file_delta_stream(svn_txdelta
apr_pool_t *pool);
-
-
+
/* UUID manipulation. */
/** Populate @a *uuid with the UUID associated with @a fs. Allocate
@@ -2309,15 +2291,13 @@ svn_fs_set_uuid(svn_fs_t *fs,
const char *uuid,
apr_pool_t *pool);
-
-
+
/* Non-historical properties. */
/* [[Yes, do tell.]] */
-
-
+
/** @defgroup svn_fs_locks Filesystem locks
* @{
* @since New in 1.2. */
Modified: subversion/trunk/subversion/libsvn_fs_base/dag.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_base/dag.c?rev=1505664&r1=1505663&r2=1505664&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_base/dag.c (original)
+++ subversion/trunk/subversion/libsvn_fs_base/dag.c Mon Jul 22 11:40:38 2013
@@ -59,8 +59,7 @@
#include "svn_private_config.h"
-
-
+
/* Initializing a filesystem. */
struct dag_node_t
@@ -91,8 +90,7 @@ struct dag_node_t
};
-
-
+
/* Trivial helper/accessor functions. */
svn_node_kind_t svn_fs_base__dag_node_kind(dag_node_t *node)
{
@@ -267,8 +265,7 @@ svn_fs_base__dag_init_fs(svn_fs_t *fs)
}
-
-
+
/*** Directory node functions ***/
/* Some of these are helpers for functions outside this section. */
@@ -541,8 +538,7 @@ svn_fs_base__dag_set_entry(dag_node_t *n
}
-
-
+
/*** Proplists. ***/
svn_error_t *
@@ -673,8 +669,7 @@ svn_fs_base__dag_set_proplist(dag_node_t
}
-
-
+
/*** Roots. ***/
svn_error_t *
@@ -1455,8 +1450,7 @@ svn_fs_base__dag_copy(dag_node_t *to_nod
}
-
-
+
/*** Deltification ***/
/* Maybe change the representation identified by TARGET_REP_KEY to be
@@ -1575,8 +1569,7 @@ svn_fs_base__dag_index_checksums(dag_nod
}
-
-
+
/*** Committing ***/
svn_error_t *
@@ -1626,8 +1619,7 @@ svn_fs_base__dag_commit_txn(svn_revnum_t
return SVN_NO_ERROR;
}
-
-
+
/*** Comparison. ***/
svn_error_t *
@@ -1671,8 +1663,7 @@ svn_fs_base__things_different(svn_boolea
}
-
-
+
/*** Mergeinfo tracking stuff ***/
svn_error_t *