Home
last modified time | relevance | path

Searched refs:src_right_version (Results 1 – 8 of 8) sorted by relevance

/freebsd-12.1/contrib/subversion/subversion/libsvn_wc/
H A Dutil.c232 const svn_wc_conflict_version_t *src_right_version, in svn_wc_conflict_description_create_tree2() argument
246 conflict->src_right_version = svn_wc_conflict_version_dup(src_right_version, in svn_wc_conflict_description_create_tree2()
305 if (conflict->src_right_version) in svn_wc_conflict_description2_dup()
306 new_conflict->src_right_version = in svn_wc_conflict_description2_dup()
307 svn_wc_conflict_version_dup(conflict->src_right_version, pool); in svn_wc_conflict_description2_dup()
377 if (conflict->src_right_version) in svn_wc__cd2_to_cd()
378 new_conflict->src_right_version = in svn_wc__cd2_to_cd()
379 svn_wc_conflict_version_dup(conflict->src_right_version, result_pool); in svn_wc__cd2_to_cd()
H A Dtree_conflicts.c213 const svn_wc_conflict_version_t *src_right_version; in svn_wc__deserialize_conflict() local
267 SVN_ERR(read_node_version_info(&src_right_version, skel->next, in svn_wc__deserialize_conflict()
271 node_kind, operation, src_left_version, src_right_version, in svn_wc__deserialize_conflict()
344 if (conflict->src_right_version) in svn_wc__serialize_conflict()
345 SVN_ERR(prepend_version_info_skel(c_skel, conflict->src_right_version, in svn_wc__serialize_conflict()
454 conflict->src_right_version, in svn_wc__add_tree_conflict()
460 conflict->src_right_version, in svn_wc__add_tree_conflict()
466 conflict->src_right_version, in svn_wc__add_tree_conflict()
H A Dupgrade.c1250 tc->src_right_version, in svn_wc__upgrade_conflict_skel_from_raw()
1257 tc->src_right_version, in svn_wc__upgrade_conflict_skel_from_raw()
1264 tc->src_right_version, in svn_wc__upgrade_conflict_skel_from_raw()
H A Ddeprecated.c3227 if (conflict->src_right_version) in conflict_description_dup()
3228 new_conflict->src_right_version = in conflict_description_dup()
3229 svn_wc_conflict_version_dup(conflict->src_right_version, pool); in conflict_description_dup()
4727 svn_wc_conflict_version_t *src_right_version, in svn_wc_conflict_description_create_tree() argument
4739 conflict->src_right_version = src_right_version; in svn_wc_conflict_description_create_tree()
H A Dconflicts.c1173 cdesc->src_right_version = right_version; in generate_propconflict()
1765 (*desc)->src_right_version = right_version; in read_text_conflict_desc()
2124 desc->src_right_version = right_version; in read_prop_conflict_descs()
2156 desc->src_right_version = right_version; in read_prop_conflict_descs()
/freebsd-12.1/contrib/subversion/subversion/svn/
H A Dinfo-cmd.c689 const char *src_right_version; in print_info() local
721 src_right_version = in print_info()
734 if (src_right_version) in print_info()
737 src_right_version)); in print_info()
/freebsd-12.1/contrib/subversion/subversion/include/
H A Dsvn_wc.h1890 const svn_wc_conflict_version_t *src_right_version; member
2021 svn_wc_conflict_version_t *src_right_version; member
2113 const svn_wc_conflict_version_t *src_right_version,
2131 /* non-const */ svn_wc_conflict_version_t *src_right_version,
/freebsd-12.1/contrib/subversion/subversion/libsvn_client/
H A Dconflicts.c10672 else if (get_conflict_desc2_t(conflict)->src_right_version) in svn_client_conflict_get_repos_info()
10674 get_conflict_desc2_t(conflict)->src_right_version->repos_url; in svn_client_conflict_get_repos_info()
10684 else if (get_conflict_desc2_t(conflict)->src_right_version) in svn_client_conflict_get_repos_info()
10686 get_conflict_desc2_t(conflict)->src_right_version->repos_uuid; in svn_client_conflict_get_repos_info()
10744 if (get_conflict_desc2_t(conflict)->src_right_version) in svn_client_conflict_get_incoming_new_repos_location()
10746 get_conflict_desc2_t(conflict)->src_right_version->path_in_repos; in svn_client_conflict_get_incoming_new_repos_location()
10753 if (get_conflict_desc2_t(conflict)->src_right_version) in svn_client_conflict_get_incoming_new_repos_location()
10755 get_conflict_desc2_t(conflict)->src_right_version->peg_rev; in svn_client_conflict_get_incoming_new_repos_location()
10762 if (get_conflict_desc2_t(conflict)->src_right_version) in svn_client_conflict_get_incoming_new_repos_location()
10764 get_conflict_desc2_t(conflict)->src_right_version->node_kind; in svn_client_conflict_get_incoming_new_repos_location()