Searched refs:right_version (Results 1 – 6 of 6) sorted by relevance
| /NextBSD/contrib/subversion/subversion/libsvn_wc/ |
| HD | conflicts.c | 1148 const svn_wc_conflict_version_t *right_version, in generate_propconflict() argument
1172 cdesc->src_right_version = right_version; in generate_propconflict()
1739 const svn_wc_conflict_version_t *right_version, in read_text_conflict_desc() argument
1748 (*desc)->src_right_version = right_version; in read_text_conflict_desc()
1778 const svn_wc_conflict_version_t *right_version, in read_tree_conflict_desc() argument
1810 left_version, right_version, in read_tree_conflict_desc()
1850 const svn_wc_conflict_version_t *right_version = NULL; in svn_wc__conflict_invoke_resolver() local
1862 right_version = APR_ARRAY_IDX(locations, 1, const svn_wc_conflict_version_t *); in svn_wc__conflict_invoke_resolver()
1915 right_version, in svn_wc__conflict_invoke_resolver()
1960 operation, left_version, right_version, in svn_wc__conflict_invoke_resolver()
[all …]
|
| HD | wc_db_update_move.c | 2281 svn_wc_conflict_version_t **right_version, in fetch_conflict_details() argument
2339 if (right_version) in fetch_conflict_details()
2342 *right_version = APR_ARRAY_IDX(locations, 1, in fetch_conflict_details()
2345 *right_version = NULL; in fetch_conflict_details()
2443 svn_wc_conflict_version_t *left_version, *right_version; in svn_wc__db_op_raise_moved_away() local
2458 &left_version, &right_version, in svn_wc__db_op_raise_moved_away()
2467 left_version, right_version, in svn_wc__db_op_raise_moved_away()
2477 (right_version in svn_wc__db_op_raise_moved_away()
2478 ? right_version->peg_rev in svn_wc__db_op_raise_moved_away()
|
| HD | merge.c | 1215 const svn_wc_conflict_version_t *right_version, in svn_wc_merge5() argument
1372 right_version, in svn_wc_merge5()
|
| HD | props.c | 162 const svn_wc_conflict_version_t *right_version, in svn_wc_merge_props3() argument
300 right_version, in svn_wc_merge_props3()
|
| HD | deprecated.c | 4511 const svn_wc_conflict_version_t *right_version, in svn_wc_merge4() argument
4533 right_version, in svn_wc_merge4()
|
| /NextBSD/contrib/subversion/subversion/include/ |
| HD | svn_wc.h | 6984 const svn_wc_conflict_version_t *right_version,
7017 const svn_wc_conflict_version_t *right_version,
7136 const svn_wc_conflict_version_t *right_version,
|