28 #ifndef SVN_MERGEINFO_H
29 #define SVN_MERGEINFO_H
31 #include <apr_pools.h>
32 #include <apr_tables.h>
107 #define SVN_MERGEINFO_NONINHERITABLE_STR "*"
143 typedef apr_hash_t *svn_mergeinfo_catalog_t;
191 svn_mergeinfo_t mergefrom, svn_mergeinfo_t mergeto,
223 svn_mergeinfo_catalog_t changes_catalog,
224 apr_pool_t *result_pool,
225 apr_pool_t *scratch_pool);
234 svn_mergeinfo_t whiteboard, apr_pool_t *pool);
249 svn_mergeinfo_t eraser,
250 svn_mergeinfo_t whiteboard,
252 apr_pool_t *result_pool,
253 apr_pool_t *scratch_pool);
268 const apr_array_header_t *from,
const apr_array_header_t *to,
289 const apr_array_header_t *changes,
307 const apr_array_header_t *whiteboard,
324 svn_mergeinfo_t mergeinfo1,
325 svn_mergeinfo_t mergeinfo2,
327 apr_pool_t *result_pool,
328 apr_pool_t *scratch_pool);
337 svn_mergeinfo_t mergeinfo1,
338 svn_mergeinfo_t mergeinfo2,
361 const apr_array_header_t *rangelist1,
362 const apr_array_header_t *rangelist2,
387 const apr_array_header_t *rangelist,
403 const apr_array_header_t *rangelist,
407 apr_pool_t *result_pool,
408 apr_pool_t *scratch_pool);
418 const apr_array_header_t *rangelist,
439 svn_mergeinfo_t mergeinfo,
444 apr_pool_t *result_pool,
445 apr_pool_t *scratch_pool);
455 svn_mergeinfo_t mergeinfo,
472 svn_mergeinfo_t mergeinput,
490 svn_mergeinfo_catalog_t