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_t;
144 typedef apr_hash_t *svn_mergeinfo_catalog_t;
194 svn_mergeinfo_t mergefrom, svn_mergeinfo_t mergeto,
196 apr_pool_t *result_pool,
197 apr_pool_t *scratch_pool);
207 svn_mergeinfo_t mergefrom, svn_mergeinfo_t mergeto,
230 svn_mergeinfo_t changes,
231 apr_pool_t *result_pool,
232 apr_pool_t *scratch_pool);
241 svn_mergeinfo_t changes,
255 svn_mergeinfo_catalog_t changes_catalog,
256 apr_pool_t *result_pool,
257 apr_pool_t *scratch_pool);
266 svn_mergeinfo_t whiteboard, apr_pool_t *pool);
281 svn_mergeinfo_t eraser,
282 svn_mergeinfo_t whiteboard,
284 apr_pool_t *result_pool,
285 apr_pool_t *scratch_pool);
300 const svn_rangelist_t *from,
const svn_rangelist_t *to,
327 const svn_rangelist_t *changes,
328 apr_pool_t *result_pool,
329 apr_pool_t *scratch_pool);
346 const svn_rangelist_t *changes,
364 const svn_rangelist_t *whiteboard,
381 svn_mergeinfo_t mergeinfo1,
382 svn_mergeinfo_t mergeinfo2,
384 apr_pool_t *result_pool,
385 apr_pool_t *scratch_pool);
394 svn_mergeinfo_t mergeinfo1,
395 svn_mergeinfo_t mergeinfo2,
418 const svn_rangelist_t *rangelist1,
419 const svn_rangelist_t *rangelist2,
444 const svn_rangelist_t *rangelist,
460 const svn_rangelist_t *rangelist,
464 apr_pool_t *result_pool,
465 apr_pool_t *scratch_pool);
475 const svn_rangelist_t *rangelist,
496 svn_mergeinfo_t mergeinfo,
501 apr_pool_t *result_pool,
502 apr_pool_t *scratch_pool);
512 svn_mergeinfo_t mergeinfo,
529 svn_mergeinfo_t mergeinput,
547 svn_mergeinfo_catalog_t