You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by da...@apache.org on 2012/03/23 19:20:52 UTC
svn commit: r1304541 - /subversion/trunk/subversion/libsvn_fs/fs-loader.h
Author: danielsh
Date: Fri Mar 23 18:20:52 2012
New Revision: 1304541
URL: http://svn.apache.org/viewvc?rev=1304541&view=rev
Log:
* subversion/libsvn_fs/fs-loader.h
(root_vtable_t): Separate 'merge' and 'get_mergeinfo', which aren't
really related.
Modified:
subversion/trunk/subversion/libsvn_fs/fs-loader.h
Modified: subversion/trunk/subversion/libsvn_fs/fs-loader.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs/fs-loader.h?rev=1304541&r1=1304540&r2=1304541&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs/fs-loader.h (original)
+++ subversion/trunk/subversion/libsvn_fs/fs-loader.h Fri Mar 23 18:20:52 2012
@@ -333,6 +333,7 @@ typedef struct root_vtable_t
svn_fs_root_t *ancestor_root,
const char *ancestor_path,
apr_pool_t *pool);
+ /* Mergeinfo. */
svn_error_t *(*get_mergeinfo)(svn_mergeinfo_catalog_t *catalog,
svn_fs_root_t *root,
const apr_array_header_t *paths,