Home
last modified time | relevance | path

Searched refs:conflict_operation (Results 1 – 12 of 12) sorted by relevance

/dports/java/java-subversion/subversion-1.14.1/subversion/svn/
H A Dcl-conflicts.c290 svn_wc_operation_t conflict_operation; in svn_cl__get_human_readable_tree_conflict_description() local
295 conflict_operation = svn_client_conflict_get_operation(conflict); in svn_cl__get_human_readable_tree_conflict_description()
319 conflict_operation); in svn_cl__get_human_readable_tree_conflict_description()
321 operation = operation_str(conflict_operation); in svn_cl__get_human_readable_tree_conflict_description()
481 svn_wc_operation_t conflict_operation; in svn_cl__append_conflict_info_xml() local
487 conflict_operation = svn_client_conflict_get_operation(conflict); in svn_cl__append_conflict_info_xml()
507 svn_cl__operation_str_xml(conflict_operation, scratch_pool)); in svn_cl__append_conflict_info_xml()
510 svn_cl__operation_str_xml(conflict_operation, scratch_pool)); in svn_cl__append_conflict_info_xml()
/dports/devel/py-subversion/subversion-1.14.1/subversion/svn/
H A Dcl-conflicts.c290 svn_wc_operation_t conflict_operation; in svn_cl__get_human_readable_tree_conflict_description() local
295 conflict_operation = svn_client_conflict_get_operation(conflict); in svn_cl__get_human_readable_tree_conflict_description()
319 conflict_operation); in svn_cl__get_human_readable_tree_conflict_description()
321 operation = operation_str(conflict_operation); in svn_cl__get_human_readable_tree_conflict_description()
481 svn_wc_operation_t conflict_operation; in svn_cl__append_conflict_info_xml() local
487 conflict_operation = svn_client_conflict_get_operation(conflict); in svn_cl__append_conflict_info_xml()
507 svn_cl__operation_str_xml(conflict_operation, scratch_pool)); in svn_cl__append_conflict_info_xml()
510 svn_cl__operation_str_xml(conflict_operation, scratch_pool)); in svn_cl__append_conflict_info_xml()
/dports/security/subversion-gnome-keyring/subversion-1.14.1/subversion/svn/
H A Dcl-conflicts.c290 svn_wc_operation_t conflict_operation; in svn_cl__get_human_readable_tree_conflict_description() local
295 conflict_operation = svn_client_conflict_get_operation(conflict); in svn_cl__get_human_readable_tree_conflict_description()
319 conflict_operation); in svn_cl__get_human_readable_tree_conflict_description()
321 operation = operation_str(conflict_operation); in svn_cl__get_human_readable_tree_conflict_description()
481 svn_wc_operation_t conflict_operation; in svn_cl__append_conflict_info_xml() local
487 conflict_operation = svn_client_conflict_get_operation(conflict); in svn_cl__append_conflict_info_xml()
507 svn_cl__operation_str_xml(conflict_operation, scratch_pool)); in svn_cl__append_conflict_info_xml()
510 svn_cl__operation_str_xml(conflict_operation, scratch_pool)); in svn_cl__append_conflict_info_xml()
/dports/devel/p5-subversion/subversion-1.14.1/subversion/svn/
H A Dcl-conflicts.c290 svn_wc_operation_t conflict_operation; in svn_cl__get_human_readable_tree_conflict_description() local
295 conflict_operation = svn_client_conflict_get_operation(conflict); in svn_cl__get_human_readable_tree_conflict_description()
319 conflict_operation); in svn_cl__get_human_readable_tree_conflict_description()
321 operation = operation_str(conflict_operation); in svn_cl__get_human_readable_tree_conflict_description()
481 svn_wc_operation_t conflict_operation; in svn_cl__append_conflict_info_xml() local
487 conflict_operation = svn_client_conflict_get_operation(conflict); in svn_cl__append_conflict_info_xml()
507 svn_cl__operation_str_xml(conflict_operation, scratch_pool)); in svn_cl__append_conflict_info_xml()
510 svn_cl__operation_str_xml(conflict_operation, scratch_pool)); in svn_cl__append_conflict_info_xml()
/dports/java/java-subversion/subversion-1.14.1/subversion/libsvn_client/
H A Dconflicts.c3570 svn_wc_operation_t conflict_operation; in conflict_tree_get_incoming_description_generic() local
3598 conflict_operation); in conflict_tree_get_incoming_description_generic()
4789 svn_wc_operation_t conflict_operation; in conflict_tree_get_description_incoming_delete() local
4812 if (conflict_operation == svn_wc_operation_update) in conflict_tree_get_description_incoming_delete()
4852 else if (conflict_operation == svn_wc_operation_merge) in conflict_tree_get_description_incoming_delete()
5772 svn_wc_operation_t conflict_operation; in conflict_tree_get_description_incoming_add() local
5798 if (conflict_operation == svn_wc_operation_update) in conflict_tree_get_description_incoming_add()
5813 else if (conflict_operation == svn_wc_operation_merge) in conflict_tree_get_description_incoming_add()
6213 svn_wc_operation_t conflict_operation; in conflict_tree_get_description_incoming_edit() local
6238 if (conflict_operation == svn_wc_operation_update) in conflict_tree_get_description_incoming_edit()
[all …]
/dports/devel/py-subversion/subversion-1.14.1/subversion/libsvn_client/
H A Dconflicts.c3570 svn_wc_operation_t conflict_operation; in conflict_tree_get_incoming_description_generic() local
3598 conflict_operation); in conflict_tree_get_incoming_description_generic()
4789 svn_wc_operation_t conflict_operation; in conflict_tree_get_description_incoming_delete() local
4812 if (conflict_operation == svn_wc_operation_update) in conflict_tree_get_description_incoming_delete()
4852 else if (conflict_operation == svn_wc_operation_merge) in conflict_tree_get_description_incoming_delete()
5772 svn_wc_operation_t conflict_operation; in conflict_tree_get_description_incoming_add() local
5798 if (conflict_operation == svn_wc_operation_update) in conflict_tree_get_description_incoming_add()
5813 else if (conflict_operation == svn_wc_operation_merge) in conflict_tree_get_description_incoming_add()
6213 svn_wc_operation_t conflict_operation; in conflict_tree_get_description_incoming_edit() local
6238 if (conflict_operation == svn_wc_operation_update) in conflict_tree_get_description_incoming_edit()
[all …]
/dports/security/subversion-gnome-keyring/subversion-1.14.1/subversion/libsvn_client/
H A Dconflicts.c3570 svn_wc_operation_t conflict_operation; in conflict_tree_get_incoming_description_generic() local
3598 conflict_operation); in conflict_tree_get_incoming_description_generic()
4789 svn_wc_operation_t conflict_operation; in conflict_tree_get_description_incoming_delete() local
4812 if (conflict_operation == svn_wc_operation_update) in conflict_tree_get_description_incoming_delete()
4852 else if (conflict_operation == svn_wc_operation_merge) in conflict_tree_get_description_incoming_delete()
5772 svn_wc_operation_t conflict_operation; in conflict_tree_get_description_incoming_add() local
5798 if (conflict_operation == svn_wc_operation_update) in conflict_tree_get_description_incoming_add()
5813 else if (conflict_operation == svn_wc_operation_merge) in conflict_tree_get_description_incoming_add()
6213 svn_wc_operation_t conflict_operation; in conflict_tree_get_description_incoming_edit() local
6238 if (conflict_operation == svn_wc_operation_update) in conflict_tree_get_description_incoming_edit()
[all …]
/dports/devel/p5-subversion/subversion-1.14.1/subversion/libsvn_client/
H A Dconflicts.c3570 svn_wc_operation_t conflict_operation; in conflict_tree_get_incoming_description_generic() local
3598 conflict_operation); in conflict_tree_get_incoming_description_generic()
4789 svn_wc_operation_t conflict_operation; in conflict_tree_get_description_incoming_delete() local
4812 if (conflict_operation == svn_wc_operation_update) in conflict_tree_get_description_incoming_delete()
4852 else if (conflict_operation == svn_wc_operation_merge) in conflict_tree_get_description_incoming_delete()
5772 svn_wc_operation_t conflict_operation; in conflict_tree_get_description_incoming_add() local
5798 if (conflict_operation == svn_wc_operation_update) in conflict_tree_get_description_incoming_add()
5813 else if (conflict_operation == svn_wc_operation_merge) in conflict_tree_get_description_incoming_add()
6213 svn_wc_operation_t conflict_operation; in conflict_tree_get_description_incoming_edit() local
6238 if (conflict_operation == svn_wc_operation_update) in conflict_tree_get_description_incoming_edit()
[all …]
/dports/java/java-subversion/subversion-1.14.1/subversion/libsvn_wc/
H A Dwc_db_update_move.c453 svn_wc_operation_t conflict_operation; in create_tree_conflict() local
456 SVN_ERR(svn_wc__conflict_read_info(&conflict_operation, NULL, NULL, NULL, in create_tree_conflict()
461 if (conflict_operation != svn_wc_operation_update in create_tree_conflict()
462 && conflict_operation != svn_wc_operation_switch) in create_tree_conflict()
/dports/devel/py-subversion/subversion-1.14.1/subversion/libsvn_wc/
H A Dwc_db_update_move.c453 svn_wc_operation_t conflict_operation; in create_tree_conflict() local
456 SVN_ERR(svn_wc__conflict_read_info(&conflict_operation, NULL, NULL, NULL, in create_tree_conflict()
461 if (conflict_operation != svn_wc_operation_update in create_tree_conflict()
462 && conflict_operation != svn_wc_operation_switch) in create_tree_conflict()
/dports/security/subversion-gnome-keyring/subversion-1.14.1/subversion/libsvn_wc/
H A Dwc_db_update_move.c453 svn_wc_operation_t conflict_operation; in create_tree_conflict() local
456 SVN_ERR(svn_wc__conflict_read_info(&conflict_operation, NULL, NULL, NULL, in create_tree_conflict()
461 if (conflict_operation != svn_wc_operation_update in create_tree_conflict()
462 && conflict_operation != svn_wc_operation_switch) in create_tree_conflict()
/dports/devel/p5-subversion/subversion-1.14.1/subversion/libsvn_wc/
H A Dwc_db_update_move.c453 svn_wc_operation_t conflict_operation; in create_tree_conflict() local
456 SVN_ERR(svn_wc__conflict_read_info(&conflict_operation, NULL, NULL, NULL, in create_tree_conflict()
461 if (conflict_operation != svn_wc_operation_update in create_tree_conflict()
462 && conflict_operation != svn_wc_operation_switch) in create_tree_conflict()