Home
last modified time | relevance | path

Searched refs:right_version (Results 1 – 7 of 7) sorted by relevance

/freebsd-13.1/contrib/subversion/subversion/libsvn_wc/
H A Dconflicts.c1183 const svn_wc_conflict_version_t *right_version, in generate_propconflict() argument
1207 cdesc->src_right_version = right_version; in generate_propconflict()
1790 const svn_wc_conflict_version_t *right_version, in read_text_conflict_desc() argument
1799 (*desc)->src_right_version = right_version; in read_text_conflict_desc()
1829 const svn_wc_conflict_version_t *right_version, in read_tree_conflict_desc() argument
1901 const svn_wc_conflict_version_t *right_version = NULL; in svn_wc__conflict_invoke_resolver() local
1966 right_version, in svn_wc__conflict_invoke_resolver()
2110 const svn_wc_conflict_version_t *right_version, in read_prop_conflict_descs() argument
2158 desc->src_right_version = right_version; in read_prop_conflict_descs()
2190 desc->src_right_version = right_version; in read_prop_conflict_descs()
[all …]
H A Dwc_db_update_move.c4071 svn_wc_conflict_version_t **right_version, in fetch_conflict_details() argument
4129 if (right_version) in fetch_conflict_details()
4132 *right_version = APR_ARRAY_IDX(locations, 1, in fetch_conflict_details()
4135 *right_version = NULL; in fetch_conflict_details()
4233 svn_wc_conflict_version_t *left_version, *right_version; in svn_wc__db_op_raise_moved_away() local
4248 &left_version, &right_version, in svn_wc__db_op_raise_moved_away()
4257 left_version, right_version, in svn_wc__db_op_raise_moved_away()
4267 (right_version in svn_wc__db_op_raise_moved_away()
4268 ? right_version->peg_rev in svn_wc__db_op_raise_moved_away()
H A Dmerge.c1215 const svn_wc_conflict_version_t *right_version, in svn_wc_merge5() argument
1372 right_version, in svn_wc_merge5()
H A Dprops.c162 const svn_wc_conflict_version_t *right_version, in svn_wc_merge_props3() argument
300 right_version, in svn_wc_merge_props3()
H A Ddeprecated.c4567 const svn_wc_conflict_version_t *right_version, in svn_wc_merge4() argument
4589 right_version, in svn_wc_merge4()
/freebsd-13.1/contrib/subversion/subversion/include/
H A Dsvn_wc.h7022 const svn_wc_conflict_version_t *right_version,
7055 const svn_wc_conflict_version_t *right_version,
7174 const svn_wc_conflict_version_t *right_version,
/freebsd-13.1/contrib/subversion/subversion/libsvn_client/
H A Dconflicts.c7365 const svn_wc_conflict_version_t *right_version; in raise_tree_conflict() local
7373 right_version = svn_wc_conflict_version_create2(repos_root_url, in raise_tree_conflict()
7383 right_version, in raise_tree_conflict()
7427 const svn_wc_conflict_version_t *right_version; in merge_added_dir_props() local
7434 right_version = svn_wc_conflict_version_create2( in merge_added_dir_props()
7455 left_version, right_version, in merge_added_dir_props()