Hi All,
Find the attached patch and log.
With regards
Kamesh Jayachandran
[[[
Patch by: Kamesh Jayachandran <kamesh@collab.net>
r21852 meant to refer 'SVN_FS_MERGE_INFO__DB_NAME'
but accidentally referred 'SVN_FS_MERGE_INFO_DB_NAME' which caused the
compile failure.
* subversion/libsvn_fs_util/merge-info-sqlite-index.c
(global):
Removing outdated comments which should have been removed by r21852.
(path_mergeinfo_db):
'SVN_FS_MERGE_INFO_DB_NAME' -> 'SVN_FS_MERGE_INFO__DB_NAME'
]]]
Index: subversion/libsvn_fs_util/merge-info-sqlite-index.c
===================================================================
--- subversion/libsvn_fs_util/merge-info-sqlite-index.c (revision 21862)
+++ subversion/libsvn_fs_util/merge-info-sqlite-index.c (working copy)
@@ -34,9 +34,6 @@
#include "../libsvn_fs/fs-loader.h"
#include "svn_private_config.h"
-/* Following are defines that specify the textual elements of the
- native filesystem directories and revision files. */
-
/* We want to cache that we saw no mergeinfo for a path as well,
so we use a -1 converted to a pointer to represent this. */
#define NEGATIVE_CACHE_RESULT ((void *)(-1))
@@ -53,7 +50,7 @@
static const char *
path_mergeinfo_db(const char *path, apr_pool_t *pool)
{
- return svn_path_join(path, SVN_FS_MERGE_INFO_DB_NAME, pool);
+ return svn_path_join(path, SVN_FS_MERGE_INFO__DB_NAME, pool);
}
#ifdef SQLITE3_DEBUG
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Oct 10 10:46:40 2006