Home
last modified time | relevance | path

Searched defs:conflict_skel (Results 1 – 25 of 36) sorted by relevance

12

/dports/java/java-subversion/subversion-1.14.1/subversion/libsvn_wc/
H A Dconflicts.c195 const svn_skel_t *conflict_skel) in conflict__get_operation()
318 const svn_skel_t *conflict_skel, in conflict__get_conflict()
609 svn_skel_t *conflict_skel, in svn_wc__conflict_skel_resolve()
1786 const svn_skel_t *conflict_skel, in read_text_conflict_desc()
2105 svn_skel_t *conflict_skel, in read_prop_conflict_descs()
2287 svn_skel_t **conflict_skel, in svn_wc__read_conflicts()
3505 svn_skel_t *conflict_skel; in svn_wc__conflict_tree_update_break_moved_away() local
3592 svn_skel_t *conflict_skel; in svn_wc__conflict_tree_update_raise_moved_away() local
3670 svn_skel_t *conflict_skel; in svn_wc__conflict_tree_update_moved_away_node() local
3756 svn_skel_t *conflict_skel; in svn_wc__conflict_tree_update_incoming_move() local
[all …]
H A Dmerge.c817 svn_skel_t **conflict_skel, in merge_text_file()
987 svn_skel_t **conflict_skel, in merge_binary_file()
1079 svn_skel_t **conflict_skel, in svn_wc__internal_merge()
1229 svn_skel_t *conflict_skel = NULL; in svn_wc_merge5() local
H A Dtree_conflicts.c411 svn_skel_t *conflict_skel; in svn_wc__add_tree_conflict() local
H A Dwc_db_update_move.c1088 svn_skel_t *conflict_skel, in create_conflict_markers()
1157 svn_skel_t **conflict_skel, in update_working_props()
1220 svn_skel_t *conflict_skel = NULL; in tc_editor_alter_directory() local
1322 svn_skel_t *conflict_skel = NULL; in tc_editor_alter_file() local
1474 svn_skel_t *conflict_skel = NULL; in tc_editor_update_incoming_moved_file() local
3063 svn_skel_t **conflict_skel, in update_incoming_add_merge_props()
3114 svn_skel_t *conflict_skel = NULL; in tc_editor_update_add_merge_files() local
3255 svn_skel_t *conflict_skel = NULL; in tc_editor_update_add_merge_dirprops() local
4075 const svn_skel_t *conflict_skel, in fetch_conflict_details()
H A Dupdate_editor.c2437 svn_skel_t *conflict_skel = NULL; in close_directory() local
3853 svn_skel_t **conflict_skel, in svn_wc__perform_file_merge()
3987 svn_skel_t **conflict_skel, in merge_file()
4211 svn_skel_t *conflict_skel = NULL; in close_file() local
H A Dprops.c182 svn_skel_t *conflict_skel = NULL; in svn_wc_merge_props3() local
1220 svn_wc__merge_props(svn_skel_t **conflict_skel, in svn_wc__merge_props()
/dports/devel/py-subversion/subversion-1.14.1/subversion/libsvn_wc/
H A Dconflicts.c195 const svn_skel_t *conflict_skel) in conflict__get_operation()
318 const svn_skel_t *conflict_skel, in conflict__get_conflict()
609 svn_skel_t *conflict_skel, in svn_wc__conflict_skel_resolve()
1786 const svn_skel_t *conflict_skel, in read_text_conflict_desc()
2105 svn_skel_t *conflict_skel, in read_prop_conflict_descs()
2287 svn_skel_t **conflict_skel, in svn_wc__read_conflicts()
3505 svn_skel_t *conflict_skel; in svn_wc__conflict_tree_update_break_moved_away() local
3592 svn_skel_t *conflict_skel; in svn_wc__conflict_tree_update_raise_moved_away() local
3670 svn_skel_t *conflict_skel; in svn_wc__conflict_tree_update_moved_away_node() local
3756 svn_skel_t *conflict_skel; in svn_wc__conflict_tree_update_incoming_move() local
[all …]
H A Dmerge.c817 svn_skel_t **conflict_skel, in merge_text_file()
987 svn_skel_t **conflict_skel, in merge_binary_file()
1079 svn_skel_t **conflict_skel, in svn_wc__internal_merge()
1229 svn_skel_t *conflict_skel = NULL; in svn_wc_merge5() local
H A Dtree_conflicts.c411 svn_skel_t *conflict_skel; in svn_wc__add_tree_conflict() local
H A Dwc_db_update_move.c1088 svn_skel_t *conflict_skel, in create_conflict_markers()
1157 svn_skel_t **conflict_skel, in update_working_props()
1220 svn_skel_t *conflict_skel = NULL; in tc_editor_alter_directory() local
1322 svn_skel_t *conflict_skel = NULL; in tc_editor_alter_file() local
1474 svn_skel_t *conflict_skel = NULL; in tc_editor_update_incoming_moved_file() local
3063 svn_skel_t **conflict_skel, in update_incoming_add_merge_props()
3114 svn_skel_t *conflict_skel = NULL; in tc_editor_update_add_merge_files() local
3255 svn_skel_t *conflict_skel = NULL; in tc_editor_update_add_merge_dirprops() local
4075 const svn_skel_t *conflict_skel, in fetch_conflict_details()
H A Dupdate_editor.c2437 svn_skel_t *conflict_skel = NULL; in close_directory() local
3853 svn_skel_t **conflict_skel, in svn_wc__perform_file_merge()
3987 svn_skel_t **conflict_skel, in merge_file()
4211 svn_skel_t *conflict_skel = NULL; in close_file() local
/dports/security/subversion-gnome-keyring/subversion-1.14.1/subversion/libsvn_wc/
H A Dconflicts.c195 const svn_skel_t *conflict_skel) in conflict__get_operation()
318 const svn_skel_t *conflict_skel, in conflict__get_conflict()
609 svn_skel_t *conflict_skel, in svn_wc__conflict_skel_resolve()
1786 const svn_skel_t *conflict_skel, in read_text_conflict_desc()
2105 svn_skel_t *conflict_skel, in read_prop_conflict_descs()
2287 svn_skel_t **conflict_skel, in svn_wc__read_conflicts()
3505 svn_skel_t *conflict_skel; in svn_wc__conflict_tree_update_break_moved_away() local
3592 svn_skel_t *conflict_skel; in svn_wc__conflict_tree_update_raise_moved_away() local
3670 svn_skel_t *conflict_skel; in svn_wc__conflict_tree_update_moved_away_node() local
3756 svn_skel_t *conflict_skel; in svn_wc__conflict_tree_update_incoming_move() local
[all …]
H A Dmerge.c817 svn_skel_t **conflict_skel, in merge_text_file()
987 svn_skel_t **conflict_skel, in merge_binary_file()
1079 svn_skel_t **conflict_skel, in svn_wc__internal_merge()
1229 svn_skel_t *conflict_skel = NULL; in svn_wc_merge5() local
H A Dtree_conflicts.c411 svn_skel_t *conflict_skel; in svn_wc__add_tree_conflict() local
H A Dwc_db_update_move.c1088 svn_skel_t *conflict_skel, in create_conflict_markers()
1157 svn_skel_t **conflict_skel, in update_working_props()
1220 svn_skel_t *conflict_skel = NULL; in tc_editor_alter_directory() local
1322 svn_skel_t *conflict_skel = NULL; in tc_editor_alter_file() local
1474 svn_skel_t *conflict_skel = NULL; in tc_editor_update_incoming_moved_file() local
3063 svn_skel_t **conflict_skel, in update_incoming_add_merge_props()
3114 svn_skel_t *conflict_skel = NULL; in tc_editor_update_add_merge_files() local
3255 svn_skel_t *conflict_skel = NULL; in tc_editor_update_add_merge_dirprops() local
4075 const svn_skel_t *conflict_skel, in fetch_conflict_details()
H A Dupdate_editor.c2437 svn_skel_t *conflict_skel = NULL; in close_directory() local
3853 svn_skel_t **conflict_skel, in svn_wc__perform_file_merge()
3987 svn_skel_t **conflict_skel, in merge_file()
4211 svn_skel_t *conflict_skel = NULL; in close_file() local
/dports/devel/p5-subversion/subversion-1.14.1/subversion/libsvn_wc/
H A Dconflicts.c195 const svn_skel_t *conflict_skel) in conflict__get_operation()
318 const svn_skel_t *conflict_skel, in conflict__get_conflict()
609 svn_skel_t *conflict_skel, in svn_wc__conflict_skel_resolve()
1786 const svn_skel_t *conflict_skel, in read_text_conflict_desc()
2105 svn_skel_t *conflict_skel, in read_prop_conflict_descs()
2287 svn_skel_t **conflict_skel, in svn_wc__read_conflicts()
3505 svn_skel_t *conflict_skel; in svn_wc__conflict_tree_update_break_moved_away() local
3592 svn_skel_t *conflict_skel; in svn_wc__conflict_tree_update_raise_moved_away() local
3670 svn_skel_t *conflict_skel; in svn_wc__conflict_tree_update_moved_away_node() local
3756 svn_skel_t *conflict_skel; in svn_wc__conflict_tree_update_incoming_move() local
[all …]
H A Dmerge.c817 svn_skel_t **conflict_skel, in merge_text_file()
987 svn_skel_t **conflict_skel, in merge_binary_file()
1079 svn_skel_t **conflict_skel, in svn_wc__internal_merge()
1229 svn_skel_t *conflict_skel = NULL; in svn_wc_merge5() local
H A Dtree_conflicts.c411 svn_skel_t *conflict_skel; in svn_wc__add_tree_conflict() local
H A Dwc_db_update_move.c1088 svn_skel_t *conflict_skel, in create_conflict_markers()
1157 svn_skel_t **conflict_skel, in update_working_props()
1220 svn_skel_t *conflict_skel = NULL; in tc_editor_alter_directory() local
1322 svn_skel_t *conflict_skel = NULL; in tc_editor_alter_file() local
1474 svn_skel_t *conflict_skel = NULL; in tc_editor_update_incoming_moved_file() local
3063 svn_skel_t **conflict_skel, in update_incoming_add_merge_props()
3114 svn_skel_t *conflict_skel = NULL; in tc_editor_update_add_merge_files() local
3255 svn_skel_t *conflict_skel = NULL; in tc_editor_update_add_merge_dirprops() local
4075 const svn_skel_t *conflict_skel, in fetch_conflict_details()
H A Dupdate_editor.c2437 svn_skel_t *conflict_skel = NULL; in close_directory() local
3853 svn_skel_t **conflict_skel, in svn_wc__perform_file_merge()
3987 svn_skel_t **conflict_skel, in merge_file()
4211 svn_skel_t *conflict_skel = NULL; in close_file() local
/dports/java/java-subversion/subversion-1.14.1/subversion/tests/libsvn_wc/
H A Dconflict-data-test.c377 svn_skel_t *conflict_skel; in test_serialize_prop_conflict() local
475 svn_skel_t *conflict_skel; in test_serialize_text_conflict() local
584 svn_skel_t *conflict_skel; in test_serialize_tree_conflict() local
662 svn_skel_t *conflict_skel = svn_wc__conflict_skel_create(result_pool); in create_prop_conflict_skel() local
746 svn_skel_t *conflict_skel; in test_prop_conflicts() local
/dports/devel/py-subversion/subversion-1.14.1/subversion/tests/libsvn_wc/
H A Dconflict-data-test.c377 svn_skel_t *conflict_skel; in test_serialize_prop_conflict() local
475 svn_skel_t *conflict_skel; in test_serialize_text_conflict() local
584 svn_skel_t *conflict_skel; in test_serialize_tree_conflict() local
662 svn_skel_t *conflict_skel = svn_wc__conflict_skel_create(result_pool); in create_prop_conflict_skel() local
746 svn_skel_t *conflict_skel; in test_prop_conflicts() local
/dports/security/subversion-gnome-keyring/subversion-1.14.1/subversion/tests/libsvn_wc/
H A Dconflict-data-test.c377 svn_skel_t *conflict_skel; in test_serialize_prop_conflict() local
475 svn_skel_t *conflict_skel; in test_serialize_text_conflict() local
584 svn_skel_t *conflict_skel; in test_serialize_tree_conflict() local
662 svn_skel_t *conflict_skel = svn_wc__conflict_skel_create(result_pool); in create_prop_conflict_skel() local
746 svn_skel_t *conflict_skel; in test_prop_conflicts() local
/dports/devel/p5-subversion/subversion-1.14.1/subversion/tests/libsvn_wc/
H A Dconflict-data-test.c377 svn_skel_t *conflict_skel; in test_serialize_prop_conflict() local
475 svn_skel_t *conflict_skel; in test_serialize_text_conflict() local
584 svn_skel_t *conflict_skel; in test_serialize_tree_conflict() local
662 svn_skel_t *conflict_skel = svn_wc__conflict_skel_create(result_pool); in create_prop_conflict_skel() local
746 svn_skel_t *conflict_skel; in test_prop_conflicts() local

12