Home
last modified time | relevance | path

Searched refs:svn_mergeinfo_merge2 (Results 1 – 11 of 11) sorted by relevance

/freebsd-10-stable/contrib/subversion/subversion/libsvn_diff/
Dparse-diff.c545 SVN_ERR(svn_mergeinfo_merge2(patch->mergeinfo, in parse_mergeinfo()
555 SVN_ERR(svn_mergeinfo_merge2(patch->reverse_mergeinfo, in parse_mergeinfo()
569 SVN_ERR(svn_mergeinfo_merge2(patch->reverse_mergeinfo, in parse_mergeinfo()
579 SVN_ERR(svn_mergeinfo_merge2(patch->mergeinfo, in parse_mergeinfo()
/freebsd-10-stable/contrib/subversion/subversion/include/
Dsvn_mergeinfo.h237 svn_mergeinfo_merge2(svn_mergeinfo_t mergeinfo,
/freebsd-10-stable/contrib/subversion/subversion/libsvn_repos/
Dlog.c1033 SVN_ERR(svn_mergeinfo_merge2(*deleted_mergeinfo, deleted, in get_combined_mergeinfo_changes()
1035 SVN_ERR(svn_mergeinfo_merge2(*added_mergeinfo, added, in get_combined_mergeinfo_changes()
1056 SVN_ERR(svn_mergeinfo_merge2(*deleted_mergeinfo, in get_combined_mergeinfo_changes()
1059 SVN_ERR(svn_mergeinfo_merge2(*added_mergeinfo, in get_combined_mergeinfo_changes()
1919 SVN_ERR(svn_mergeinfo_merge2(processed, mergeinfo, in store_search()
2301 SVN_ERR(svn_mergeinfo_merge2(*paths_history_mergeinfo, in get_paths_history_as_mergeinfo()
Dload-fs-vtable.c335 SVN_ERR(svn_mergeinfo_merge2(final_mergeinfo, predates_stream_mergeinfo, in renumber_mergeinfo_revs()
Drev_hunt.c1080 SVN_ERR(svn_mergeinfo_merge2(changed, deleted, result_pool, scratch_pool)); in get_merged_mergeinfo()
/freebsd-10-stable/contrib/subversion/subversion/libsvn_wc/
Dprops.c110 SVN_ERR(svn_mergeinfo_merge2(mergeinfo1, mergeinfo2, scratch_pool, in combine_mergeinfo_props()
136 SVN_ERR(svn_mergeinfo_merge2(l_deleted, r_deleted, in combine_forked_mergeinfo_props()
138 SVN_ERR(svn_mergeinfo_merge2(l_added, r_added, in combine_forked_mergeinfo_props()
144 SVN_ERR(svn_mergeinfo_merge2(from_mergeinfo, l_added, in combine_forked_mergeinfo_props()
/freebsd-10-stable/contrib/subversion/subversion/libsvn_subr/
Dmergeinfo.c1759 svn_mergeinfo_merge2(svn_mergeinfo_t mergeinfo, in svn_mergeinfo_merge2() function
1828 SVN_ERR(svn_mergeinfo_merge2(mergeinfo, changes_mergeinfo, in svn_mergeinfo_catalog_merge()
Ddeprecated.c1273 return svn_error_trace(svn_mergeinfo_merge2(mergeinfo, changes, pool, in svn_mergeinfo_merge()
/freebsd-10-stable/contrib/subversion/subversion/libsvn_client/
Dcopy.c91 SVN_ERR(svn_mergeinfo_merge2(wc_mergeinfo, mergeinfo, pool, pool)); in extend_wc_mergeinfo()
2155 SVN_ERR(svn_mergeinfo_merge2(mergeinfo, wc_mergeinfo, iterpool, in wc_to_repos_copy()
Dmerge.c984 SVN_ERR(svn_mergeinfo_merge2(filtered_mergeinfo, in filter_self_referential_mergeinfo()
5384 SVN_ERR(svn_mergeinfo_merge2(mergeinfo, existing_mergeinfo, in update_wc_mergeinfo()
7955 SVN_ERR(svn_mergeinfo_merge2(path_explicit_mergeinfo, in process_children_with_new_mergeinfo()
8907 SVN_ERR(svn_mergeinfo_merge2(merge_mergeinfo, in record_mergeinfo_for_added_subtrees()
10909 SVN_ERR(svn_mergeinfo_merge2(unmerged_for_key, in log_find_operative_revs()
11104 SVN_ERR(svn_mergeinfo_merge2(source_mergeinfo, in find_unmerged_mergeinfo_subroutine()
Dmergeinfo.c1970 SVN_ERR(svn_mergeinfo_merge2(subtree_mergeinfo, in svn_client__mergeinfo_log()