Searched refs:src_left_version (Results 1 – 9 of 9) sorted by relevance
| /freebsd-13.1/contrib/subversion/subversion/libsvn_wc/ |
| H A D | util.c | 231 const svn_wc_conflict_version_t *src_left_version, in svn_wc_conflict_description_create_tree2() argument
244 conflict->src_left_version = svn_wc_conflict_version_dup(src_left_version, in svn_wc_conflict_description_create_tree2()
302 if (conflict->src_left_version) in svn_wc_conflict_description2_dup()
303 new_conflict->src_left_version = in svn_wc_conflict_description2_dup()
304 svn_wc_conflict_version_dup(conflict->src_left_version, pool); in svn_wc_conflict_description2_dup()
374 if (conflict->src_left_version) in svn_wc__cd2_to_cd()
375 new_conflict->src_left_version = in svn_wc__cd2_to_cd()
376 svn_wc_conflict_version_dup(conflict->src_left_version, result_pool); in svn_wc__cd2_to_cd()
|
| H A D | tree_conflicts.c | 212 const svn_wc_conflict_version_t *src_left_version; in svn_wc__deserialize_conflict() local
263 SVN_ERR(read_node_version_info(&src_left_version, skel, in svn_wc__deserialize_conflict()
271 node_kind, operation, src_left_version, src_right_version, in svn_wc__deserialize_conflict()
351 if (conflict->src_left_version) in svn_wc__serialize_conflict()
352 SVN_ERR(prepend_version_info_skel(c_skel, conflict->src_left_version, in svn_wc__serialize_conflict()
453 conflict->src_left_version, in svn_wc__add_tree_conflict()
459 conflict->src_left_version, in svn_wc__add_tree_conflict()
465 conflict->src_left_version, in svn_wc__add_tree_conflict()
|
| H A D | upgrade.c | 1249 tc->src_left_version, in svn_wc__upgrade_conflict_skel_from_raw()
1256 tc->src_left_version, in svn_wc__upgrade_conflict_skel_from_raw()
1263 tc->src_left_version, in svn_wc__upgrade_conflict_skel_from_raw()
|
| H A D | deprecated.c | 3250 if (conflict->src_left_version) in conflict_description_dup()
3251 new_conflict->src_left_version = in conflict_description_dup()
3252 svn_wc_conflict_version_dup(conflict->src_left_version, pool); in conflict_description_dup()
4752 svn_wc_conflict_version_t *src_left_version, in svn_wc_conflict_description_create_tree() argument
4764 conflict->src_left_version = src_left_version; in svn_wc_conflict_description_create_tree()
|
| H A D | conflicts.c | 1206 cdesc->src_left_version = left_version; in generate_propconflict()
1798 (*desc)->src_left_version = left_version; in read_text_conflict_desc()
2157 desc->src_left_version = left_version; in read_prop_conflict_descs()
2189 desc->src_left_version = left_version; in read_prop_conflict_descs()
|
| /freebsd-13.1/contrib/subversion/subversion/svn/ |
| H A D | info-cmd.c | 980 const char *src_left_version; in print_info() local
1006 src_left_version = in print_info()
1017 if (src_left_version) in print_info()
1020 src_left_version)); in print_info()
|
| /freebsd-13.1/contrib/subversion/subversion/include/ |
| H A D | svn_wc.h | 1887 const svn_wc_conflict_version_t *src_left_version; member
2017 svn_wc_conflict_version_t *src_left_version; member
2112 const svn_wc_conflict_version_t *src_left_version,
2130 /* non-const */ svn_wc_conflict_version_t *src_left_version,
|
| /freebsd-13.1/contrib/subversion/subversion/libsvn_client/ |
| H A D | conflicts.c | 12981 if (get_conflict_desc2_t(conflict)->src_left_version) in svn_client_conflict_get_repos_info()
12983 get_conflict_desc2_t(conflict)->src_left_version->repos_url; in svn_client_conflict_get_repos_info()
12993 if (get_conflict_desc2_t(conflict)->src_left_version) in svn_client_conflict_get_repos_info()
12995 get_conflict_desc2_t(conflict)->src_left_version->repos_uuid; in svn_client_conflict_get_repos_info()
13017 if (get_conflict_desc2_t(conflict)->src_left_version) in svn_client_conflict_get_incoming_old_repos_location()
13019 get_conflict_desc2_t(conflict)->src_left_version->path_in_repos; in svn_client_conflict_get_incoming_old_repos_location()
13026 if (get_conflict_desc2_t(conflict)->src_left_version) in svn_client_conflict_get_incoming_old_repos_location()
13028 get_conflict_desc2_t(conflict)->src_left_version->peg_rev; in svn_client_conflict_get_incoming_old_repos_location()
13035 if (get_conflict_desc2_t(conflict)->src_left_version) in svn_client_conflict_get_incoming_old_repos_location()
13037 get_conflict_desc2_t(conflict)->src_left_version->node_kind; in svn_client_conflict_get_incoming_old_repos_location()
|
| H A D | merge.c | 1404 if (existing_conflict != NULL && existing_conflict->src_left_version) in record_tree_conflict()
1405 left = existing_conflict->src_left_version; in record_tree_conflict()
1949 old_tc->src_left_version->node_kind, in merge_file_opened()
2793 old_tc->src_left_version->node_kind, in merge_dir_opened()
|