/dports/java/java-subversion/subversion-1.14.1/subversion/libsvn_wc/ |
H A D | merge.c | 687 *merge_outcome = svn_wc_merge_no_merge; in merge_file_trivial() 708 *merge_outcome = svn_wc_merge_unchanged; in merge_file_trivial() 712 *merge_outcome = svn_wc_merge_merged; in merge_file_trivial() 785 *merge_outcome = svn_wc_merge_unchanged; in merge_file_trivial() 790 *merge_outcome = svn_wc_merge_no_merge; in merge_file_trivial() 885 *merge_outcome = svn_wc_merge_conflict; in merge_text_file() 1013 *merge_outcome = svn_wc_merge_conflict; in merge_binary_file() 1145 SVN_ERR(merge_file_trivial(work_items, merge_outcome, in svn_wc__internal_merge() 1150 if (*merge_outcome == svn_wc_merge_no_merge) in svn_wc__internal_merge() 1160 merge_outcome, in svn_wc__internal_merge() [all …]
|
H A D | wc.h | 406 enum svn_wc_merge_outcome_t *merge_outcome,
|
H A D | wc_db_update_move.c | 1325 enum svn_wc_merge_outcome_t merge_outcome; in tc_editor_alter_file() local 1400 &merge_outcome, b->db, in tc_editor_alter_file() 1416 if (merge_outcome == svn_wc_merge_conflict) in tc_editor_alter_file() 1475 enum svn_wc_merge_outcome_t merge_outcome; in tc_editor_update_incoming_moved_file() local 1621 &merge_outcome, b->db, in tc_editor_update_incoming_moved_file() 1639 if (merge_outcome == svn_wc_merge_conflict) in tc_editor_update_incoming_moved_file() 3113 enum svn_wc_merge_outcome_t merge_outcome; in tc_editor_update_add_merge_files() local 3184 &merge_outcome, b->db, in tc_editor_update_add_merge_files() 3200 if (merge_outcome == svn_wc_merge_conflict) in tc_editor_update_add_merge_files()
|
H A D | deprecated.c | 4558 svn_wc_merge4(enum svn_wc_merge_outcome_t *merge_outcome, in svn_wc_merge4() argument 4579 svn_wc_merge5(merge_outcome, in svn_wc_merge4() 4601 svn_wc_merge3(enum svn_wc_merge_outcome_t *merge_outcome, in svn_wc_merge3() argument 4634 SVN_ERR(svn_wc_merge4(merge_outcome, in svn_wc_merge3() 4657 svn_wc_merge2(enum svn_wc_merge_outcome_t *merge_outcome, in svn_wc_merge2() argument 4670 return svn_wc_merge3(merge_outcome, in svn_wc_merge2() 4686 enum svn_wc_merge_outcome_t *merge_outcome, in svn_wc_merge() argument 4690 return svn_wc_merge3(merge_outcome, in svn_wc_merge()
|
H A D | update_editor.c | 3879 enum svn_wc_merge_outcome_t merge_outcome = svn_wc_merge_unchanged; in svn_wc__perform_file_merge() local 3934 &merge_outcome, in svn_wc__perform_file_merge() 3948 *found_conflict = (merge_outcome == svn_wc_merge_conflict); in svn_wc__perform_file_merge()
|
/dports/devel/py-subversion/subversion-1.14.1/subversion/libsvn_wc/ |
H A D | merge.c | 687 *merge_outcome = svn_wc_merge_no_merge; in merge_file_trivial() 708 *merge_outcome = svn_wc_merge_unchanged; in merge_file_trivial() 712 *merge_outcome = svn_wc_merge_merged; in merge_file_trivial() 785 *merge_outcome = svn_wc_merge_unchanged; in merge_file_trivial() 790 *merge_outcome = svn_wc_merge_no_merge; in merge_file_trivial() 885 *merge_outcome = svn_wc_merge_conflict; in merge_text_file() 1013 *merge_outcome = svn_wc_merge_conflict; in merge_binary_file() 1145 SVN_ERR(merge_file_trivial(work_items, merge_outcome, in svn_wc__internal_merge() 1150 if (*merge_outcome == svn_wc_merge_no_merge) in svn_wc__internal_merge() 1160 merge_outcome, in svn_wc__internal_merge() [all …]
|
H A D | wc.h | 406 enum svn_wc_merge_outcome_t *merge_outcome,
|
H A D | wc_db_update_move.c | 1325 enum svn_wc_merge_outcome_t merge_outcome; in tc_editor_alter_file() local 1400 &merge_outcome, b->db, in tc_editor_alter_file() 1416 if (merge_outcome == svn_wc_merge_conflict) in tc_editor_alter_file() 1475 enum svn_wc_merge_outcome_t merge_outcome; in tc_editor_update_incoming_moved_file() local 1621 &merge_outcome, b->db, in tc_editor_update_incoming_moved_file() 1639 if (merge_outcome == svn_wc_merge_conflict) in tc_editor_update_incoming_moved_file() 3113 enum svn_wc_merge_outcome_t merge_outcome; in tc_editor_update_add_merge_files() local 3184 &merge_outcome, b->db, in tc_editor_update_add_merge_files() 3200 if (merge_outcome == svn_wc_merge_conflict) in tc_editor_update_add_merge_files()
|
H A D | deprecated.c | 4558 svn_wc_merge4(enum svn_wc_merge_outcome_t *merge_outcome, in svn_wc_merge4() argument 4579 svn_wc_merge5(merge_outcome, in svn_wc_merge4() 4601 svn_wc_merge3(enum svn_wc_merge_outcome_t *merge_outcome, in svn_wc_merge3() argument 4634 SVN_ERR(svn_wc_merge4(merge_outcome, in svn_wc_merge3() 4657 svn_wc_merge2(enum svn_wc_merge_outcome_t *merge_outcome, in svn_wc_merge2() argument 4670 return svn_wc_merge3(merge_outcome, in svn_wc_merge2() 4686 enum svn_wc_merge_outcome_t *merge_outcome, in svn_wc_merge() argument 4690 return svn_wc_merge3(merge_outcome, in svn_wc_merge()
|
H A D | update_editor.c | 3879 enum svn_wc_merge_outcome_t merge_outcome = svn_wc_merge_unchanged; in svn_wc__perform_file_merge() local 3934 &merge_outcome, in svn_wc__perform_file_merge() 3948 *found_conflict = (merge_outcome == svn_wc_merge_conflict); in svn_wc__perform_file_merge()
|
/dports/security/subversion-gnome-keyring/subversion-1.14.1/subversion/libsvn_wc/ |
H A D | merge.c | 687 *merge_outcome = svn_wc_merge_no_merge; in merge_file_trivial() 708 *merge_outcome = svn_wc_merge_unchanged; in merge_file_trivial() 712 *merge_outcome = svn_wc_merge_merged; in merge_file_trivial() 785 *merge_outcome = svn_wc_merge_unchanged; in merge_file_trivial() 790 *merge_outcome = svn_wc_merge_no_merge; in merge_file_trivial() 885 *merge_outcome = svn_wc_merge_conflict; in merge_text_file() 1013 *merge_outcome = svn_wc_merge_conflict; in merge_binary_file() 1145 SVN_ERR(merge_file_trivial(work_items, merge_outcome, in svn_wc__internal_merge() 1150 if (*merge_outcome == svn_wc_merge_no_merge) in svn_wc__internal_merge() 1160 merge_outcome, in svn_wc__internal_merge() [all …]
|
H A D | wc.h | 406 enum svn_wc_merge_outcome_t *merge_outcome,
|
H A D | wc_db_update_move.c | 1325 enum svn_wc_merge_outcome_t merge_outcome; in tc_editor_alter_file() local 1400 &merge_outcome, b->db, in tc_editor_alter_file() 1416 if (merge_outcome == svn_wc_merge_conflict) in tc_editor_alter_file() 1475 enum svn_wc_merge_outcome_t merge_outcome; in tc_editor_update_incoming_moved_file() local 1621 &merge_outcome, b->db, in tc_editor_update_incoming_moved_file() 1639 if (merge_outcome == svn_wc_merge_conflict) in tc_editor_update_incoming_moved_file() 3113 enum svn_wc_merge_outcome_t merge_outcome; in tc_editor_update_add_merge_files() local 3184 &merge_outcome, b->db, in tc_editor_update_add_merge_files() 3200 if (merge_outcome == svn_wc_merge_conflict) in tc_editor_update_add_merge_files()
|
H A D | deprecated.c | 4558 svn_wc_merge4(enum svn_wc_merge_outcome_t *merge_outcome, in svn_wc_merge4() argument 4579 svn_wc_merge5(merge_outcome, in svn_wc_merge4() 4601 svn_wc_merge3(enum svn_wc_merge_outcome_t *merge_outcome, in svn_wc_merge3() argument 4634 SVN_ERR(svn_wc_merge4(merge_outcome, in svn_wc_merge3() 4657 svn_wc_merge2(enum svn_wc_merge_outcome_t *merge_outcome, in svn_wc_merge2() argument 4670 return svn_wc_merge3(merge_outcome, in svn_wc_merge2() 4686 enum svn_wc_merge_outcome_t *merge_outcome, in svn_wc_merge() argument 4690 return svn_wc_merge3(merge_outcome, in svn_wc_merge()
|
H A D | update_editor.c | 3879 enum svn_wc_merge_outcome_t merge_outcome = svn_wc_merge_unchanged; in svn_wc__perform_file_merge() local 3934 &merge_outcome, in svn_wc__perform_file_merge() 3948 *found_conflict = (merge_outcome == svn_wc_merge_conflict); in svn_wc__perform_file_merge()
|
/dports/devel/p5-subversion/subversion-1.14.1/subversion/libsvn_wc/ |
H A D | merge.c | 687 *merge_outcome = svn_wc_merge_no_merge; in merge_file_trivial() 708 *merge_outcome = svn_wc_merge_unchanged; in merge_file_trivial() 712 *merge_outcome = svn_wc_merge_merged; in merge_file_trivial() 785 *merge_outcome = svn_wc_merge_unchanged; in merge_file_trivial() 790 *merge_outcome = svn_wc_merge_no_merge; in merge_file_trivial() 885 *merge_outcome = svn_wc_merge_conflict; in merge_text_file() 1013 *merge_outcome = svn_wc_merge_conflict; in merge_binary_file() 1145 SVN_ERR(merge_file_trivial(work_items, merge_outcome, in svn_wc__internal_merge() 1150 if (*merge_outcome == svn_wc_merge_no_merge) in svn_wc__internal_merge() 1160 merge_outcome, in svn_wc__internal_merge() [all …]
|
H A D | wc.h | 406 enum svn_wc_merge_outcome_t *merge_outcome,
|
H A D | wc_db_update_move.c | 1325 enum svn_wc_merge_outcome_t merge_outcome; in tc_editor_alter_file() local 1400 &merge_outcome, b->db, in tc_editor_alter_file() 1416 if (merge_outcome == svn_wc_merge_conflict) in tc_editor_alter_file() 1475 enum svn_wc_merge_outcome_t merge_outcome; in tc_editor_update_incoming_moved_file() local 1621 &merge_outcome, b->db, in tc_editor_update_incoming_moved_file() 1639 if (merge_outcome == svn_wc_merge_conflict) in tc_editor_update_incoming_moved_file() 3113 enum svn_wc_merge_outcome_t merge_outcome; in tc_editor_update_add_merge_files() local 3184 &merge_outcome, b->db, in tc_editor_update_add_merge_files() 3200 if (merge_outcome == svn_wc_merge_conflict) in tc_editor_update_add_merge_files()
|
H A D | deprecated.c | 4558 svn_wc_merge4(enum svn_wc_merge_outcome_t *merge_outcome, in svn_wc_merge4() argument 4579 svn_wc_merge5(merge_outcome, in svn_wc_merge4() 4601 svn_wc_merge3(enum svn_wc_merge_outcome_t *merge_outcome, in svn_wc_merge3() argument 4634 SVN_ERR(svn_wc_merge4(merge_outcome, in svn_wc_merge3() 4657 svn_wc_merge2(enum svn_wc_merge_outcome_t *merge_outcome, in svn_wc_merge2() argument 4670 return svn_wc_merge3(merge_outcome, in svn_wc_merge2() 4686 enum svn_wc_merge_outcome_t *merge_outcome, in svn_wc_merge() argument 4690 return svn_wc_merge3(merge_outcome, in svn_wc_merge()
|
H A D | update_editor.c | 3879 enum svn_wc_merge_outcome_t merge_outcome = svn_wc_merge_unchanged; in svn_wc__perform_file_merge() local 3934 &merge_outcome, in svn_wc__perform_file_merge() 3948 *found_conflict = (merge_outcome == svn_wc_merge_conflict); in svn_wc__perform_file_merge()
|
/dports/java/java-subversion/subversion-1.14.1/subversion/include/ |
H A D | svn_wc.h | 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,
|
/dports/devel/py-subversion/subversion-1.14.1/subversion/include/ |
H A D | svn_wc.h | 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,
|
/dports/security/subversion-gnome-keyring/subversion-1.14.1/subversion/include/ |
H A D | svn_wc.h | 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,
|
/dports/devel/p5-subversion/subversion-1.14.1/subversion/include/ |
H A D | svn_wc.h | 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,
|