Home
last modified time | relevance | path

Searched refs:svn_wc_merge_outcome_t (Results 1 – 9 of 9) sorted by relevance

/freebsd-13-stable/contrib/subversion/subversion/libsvn_wc/
HDmerge.c663 enum svn_wc_merge_outcome_t *merge_outcome, in merge_file_trivial()
818 enum svn_wc_merge_outcome_t *merge_outcome, in merge_text_file()
988 enum svn_wc_merge_outcome_t *merge_outcome, in merge_binary_file()
1080 enum svn_wc_merge_outcome_t *merge_outcome, in svn_wc__internal_merge()
1205 svn_wc_merge5(enum svn_wc_merge_outcome_t *merge_content_outcome, in svn_wc_merge5()
HDwc.h406 enum svn_wc_merge_outcome_t *merge_outcome,
HDdeprecated.c4558 svn_wc_merge4(enum svn_wc_merge_outcome_t *merge_outcome, in svn_wc_merge4()
4601 svn_wc_merge3(enum svn_wc_merge_outcome_t *merge_outcome, in svn_wc_merge3()
4657 svn_wc_merge2(enum svn_wc_merge_outcome_t *merge_outcome, in svn_wc_merge2()
4686 enum svn_wc_merge_outcome_t *merge_outcome, in svn_wc_merge()
HDwc_db_update_move.c1325 enum svn_wc_merge_outcome_t merge_outcome; in tc_editor_alter_file()
1475 enum svn_wc_merge_outcome_t merge_outcome; in tc_editor_update_incoming_moved_file()
3113 enum svn_wc_merge_outcome_t merge_outcome; in tc_editor_update_add_merge_files()
HDupdate_editor.c3879 enum svn_wc_merge_outcome_t merge_outcome = svn_wc_merge_unchanged; in svn_wc__perform_file_merge()
/freebsd-13-stable/contrib/subversion/subversion/include/
HDsvn_wc.h6899 typedef enum svn_wc_merge_outcome_t enum
6919 } svn_wc_merge_outcome_t; typedef
7012 svn_wc_merge5(enum svn_wc_merge_outcome_t *merge_content_outcome,
7046 svn_wc_merge4(enum svn_wc_merge_outcome_t *merge_outcome,
7082 svn_wc_merge3(enum svn_wc_merge_outcome_t *merge_outcome,
7106 svn_wc_merge2(enum svn_wc_merge_outcome_t *merge_outcome,
7134 enum svn_wc_merge_outcome_t *merge_outcome,
/freebsd-13-stable/contrib/subversion/subversion/libsvn_client/
HDconflicts.c6892 svn_wc_merge_outcome_t merge_content_outcome; in resolve_merge_incoming_added_file_text_update()
7040 svn_wc_merge_outcome_t merge_content_outcome; in resolve_merge_incoming_added_file_text_merge()
7177 svn_wc_merge_outcome_t merge_content_outcome; in resolve_merge_incoming_added_file_replace_and_merge()
7589 svn_wc_merge_outcome_t merge_content_outcome; in merge_added_files()
8505 svn_wc_merge_outcome_t merge_content_outcome; in resolve_incoming_move_file_text_merge()
8837 svn_wc_merge_outcome_t merge_content_outcome; in resolve_both_moved_file_text_merge()
9580 svn_wc_merge_outcome_t merge_content_outcome; in resolve_local_move_file_merge()
11136 svn_wc_merge_outcome_t merge_content_outcome; in resolve_both_moved_file_update_keep_local_move()
11346 svn_wc_merge_outcome_t merge_content_outcome; in resolve_both_moved_file_update_keep_incoming_move()
HDshelf2.c1402 enum svn_wc_merge_outcome_t content_outcome; in wc_file_merge()
HDmerge.c2106 enum svn_wc_merge_outcome_t content_outcome; in merge_file_changed()