Home
last modified time | relevance | path

Searched defs:tree_conflicted (Results 1 – 25 of 100) sorted by relevance

1234

/dports/java/java-subversion/subversion-1.14.1/subversion/tests/libsvn_client/
H A Dconflicts-test.c206 svn_boolean_t tree_conflicted; in create_wc_with_file_add_vs_file_add_merge_conflict() local
345 svn_boolean_t tree_conflicted; in test_merge_incoming_added_file_text_merge() local
419 svn_boolean_t tree_conflicted; in test_merge_incoming_added_file_replace_and_merge() local
506 svn_boolean_t tree_conflicted; in create_wc_with_dir_add_vs_dir_add_merge_conflict() local
661 svn_boolean_t tree_conflicted; in test_merge_incoming_added_dir_ignore() local
727 svn_boolean_t tree_conflicted; in test_merge_incoming_added_dir_merge() local
837 svn_boolean_t tree_conflicted; in test_merge_incoming_added_dir_merge2() local
952 svn_boolean_t tree_conflicted; in test_merge_incoming_added_dir_merge3() local
1066 svn_boolean_t tree_conflicted; in test_merge_incoming_added_dir_replace() local
1137 svn_boolean_t tree_conflicted; in test_merge_incoming_added_dir_replace_and_merge() local
[all …]
/dports/devel/py-subversion/subversion-1.14.1/subversion/tests/libsvn_client/
H A Dconflicts-test.c206 svn_boolean_t tree_conflicted; in create_wc_with_file_add_vs_file_add_merge_conflict() local
345 svn_boolean_t tree_conflicted; in test_merge_incoming_added_file_text_merge() local
419 svn_boolean_t tree_conflicted; in test_merge_incoming_added_file_replace_and_merge() local
506 svn_boolean_t tree_conflicted; in create_wc_with_dir_add_vs_dir_add_merge_conflict() local
661 svn_boolean_t tree_conflicted; in test_merge_incoming_added_dir_ignore() local
727 svn_boolean_t tree_conflicted; in test_merge_incoming_added_dir_merge() local
837 svn_boolean_t tree_conflicted; in test_merge_incoming_added_dir_merge2() local
952 svn_boolean_t tree_conflicted; in test_merge_incoming_added_dir_merge3() local
1066 svn_boolean_t tree_conflicted; in test_merge_incoming_added_dir_replace() local
1137 svn_boolean_t tree_conflicted; in test_merge_incoming_added_dir_replace_and_merge() local
[all …]
/dports/security/subversion-gnome-keyring/subversion-1.14.1/subversion/tests/libsvn_client/
H A Dconflicts-test.c206 svn_boolean_t tree_conflicted; in create_wc_with_file_add_vs_file_add_merge_conflict() local
345 svn_boolean_t tree_conflicted; in test_merge_incoming_added_file_text_merge() local
419 svn_boolean_t tree_conflicted; in test_merge_incoming_added_file_replace_and_merge() local
506 svn_boolean_t tree_conflicted; in create_wc_with_dir_add_vs_dir_add_merge_conflict() local
661 svn_boolean_t tree_conflicted; in test_merge_incoming_added_dir_ignore() local
727 svn_boolean_t tree_conflicted; in test_merge_incoming_added_dir_merge() local
837 svn_boolean_t tree_conflicted; in test_merge_incoming_added_dir_merge2() local
952 svn_boolean_t tree_conflicted; in test_merge_incoming_added_dir_merge3() local
1066 svn_boolean_t tree_conflicted; in test_merge_incoming_added_dir_replace() local
1137 svn_boolean_t tree_conflicted; in test_merge_incoming_added_dir_replace_and_merge() local
[all …]
/dports/devel/p5-subversion/subversion-1.14.1/subversion/tests/libsvn_client/
H A Dconflicts-test.c206 svn_boolean_t tree_conflicted; in create_wc_with_file_add_vs_file_add_merge_conflict() local
345 svn_boolean_t tree_conflicted; in test_merge_incoming_added_file_text_merge() local
419 svn_boolean_t tree_conflicted; in test_merge_incoming_added_file_replace_and_merge() local
506 svn_boolean_t tree_conflicted; in create_wc_with_dir_add_vs_dir_add_merge_conflict() local
661 svn_boolean_t tree_conflicted; in test_merge_incoming_added_dir_ignore() local
727 svn_boolean_t tree_conflicted; in test_merge_incoming_added_dir_merge() local
837 svn_boolean_t tree_conflicted; in test_merge_incoming_added_dir_merge2() local
952 svn_boolean_t tree_conflicted; in test_merge_incoming_added_dir_merge3() local
1066 svn_boolean_t tree_conflicted; in test_merge_incoming_added_dir_replace() local
1137 svn_boolean_t tree_conflicted; in test_merge_incoming_added_dir_replace_and_merge() local
[all …]
/dports/java/java-subversion/subversion-1.14.1/tools/client-side/svnconflict/
H A Dsvnconflict.c320 svn_boolean_t *tree_conflicted, in get_conflicts()
361 svn_boolean_t tree_conflicted; in svnconflict_list() local
491 svn_boolean_t tree_conflicted; in svnconflict_options_tree() local
602 svn_boolean_t tree_conflicted; in svnconflict_resolve_tree() local
/dports/devel/py-subversion/subversion-1.14.1/tools/client-side/svnconflict/
H A Dsvnconflict.c320 svn_boolean_t *tree_conflicted, in get_conflicts()
361 svn_boolean_t tree_conflicted; in svnconflict_list() local
491 svn_boolean_t tree_conflicted; in svnconflict_options_tree() local
602 svn_boolean_t tree_conflicted; in svnconflict_resolve_tree() local
/dports/security/subversion-gnome-keyring/subversion-1.14.1/tools/client-side/svnconflict/
H A Dsvnconflict.c320 svn_boolean_t *tree_conflicted, in get_conflicts()
361 svn_boolean_t tree_conflicted; in svnconflict_list() local
491 svn_boolean_t tree_conflicted; in svnconflict_options_tree() local
602 svn_boolean_t tree_conflicted; in svnconflict_resolve_tree() local
/dports/devel/p5-subversion/subversion-1.14.1/tools/client-side/svnconflict/
H A Dsvnconflict.c320 svn_boolean_t *tree_conflicted, in get_conflicts()
361 svn_boolean_t tree_conflicted; in svnconflict_list() local
491 svn_boolean_t tree_conflicted; in svnconflict_options_tree() local
602 svn_boolean_t tree_conflicted; in svnconflict_resolve_tree() local
/dports/java/java-subversion/subversion-1.14.1/subversion/svn/
H A Dstatus.c255 svn_boolean_t tree_conflicted; in print_status() local
477 svn_boolean_t tree_conflicted = FALSE; in svn_cl__print_status_xml() local
H A Dcl-conflicts.c480 svn_boolean_t tree_conflicted; in svn_cl__append_conflict_info_xml() local
/dports/devel/py-subversion/subversion-1.14.1/subversion/svn/
H A Dstatus.c255 svn_boolean_t tree_conflicted; in print_status() local
477 svn_boolean_t tree_conflicted = FALSE; in svn_cl__print_status_xml() local
/dports/security/subversion-gnome-keyring/subversion-1.14.1/subversion/svn/
H A Dstatus.c255 svn_boolean_t tree_conflicted; in print_status() local
477 svn_boolean_t tree_conflicted = FALSE; in svn_cl__print_status_xml() local
/dports/devel/p5-subversion/subversion-1.14.1/subversion/svn/
H A Dstatus.c255 svn_boolean_t tree_conflicted; in print_status() local
477 svn_boolean_t tree_conflicted = FALSE; in svn_cl__print_status_xml() local
/dports/java/java-subversion/subversion-1.14.1/subversion/libsvn_wc/
H A Dconflicts.c707 svn_boolean_t *tree_conflicted, in svn_wc__conflict_read_info()
1897 svn_boolean_t tree_conflicted; in svn_wc__conflict_invoke_resolver() local
2299 svn_boolean_t tree_conflicted; in svn_wc__read_conflicts() local
2700 svn_boolean_t tree_conflicted; in resolve_tree_conflict_on_node() local
3502 svn_boolean_t tree_conflicted; in svn_wc__conflict_tree_update_break_moved_away() local
3590 svn_boolean_t tree_conflicted; in svn_wc__conflict_tree_update_raise_moved_away() local
3667 svn_boolean_t tree_conflicted; in svn_wc__conflict_tree_update_moved_away_node() local
3754 svn_boolean_t tree_conflicted; in svn_wc__conflict_tree_update_incoming_move() local
3823 svn_boolean_t tree_conflicted; in svn_wc__conflict_tree_update_local_add() local
3912 svn_boolean_t tree_conflicted; in svn_wc__guess_incoming_move_target_nodes() local
H A Ddeprecated.c1480 svn_boolean_t *tree_conflicted, in wrap_3to1_file_added()
1537 svn_boolean_t *tree_conflicted, in wrap_3to1_dir_added()
1554 svn_boolean_t *tree_conflicted, in wrap_3to1_dir_deleted()
1675 svn_boolean_t *tree_conflicted, in wrap_3to2_file_added()
1727 svn_boolean_t *tree_conflicted, in wrap_3to2_dir_added()
1745 svn_boolean_t *tree_conflicted, in wrap_3to2_dir_deleted()
1801 wrap_4to3_file_opened(svn_boolean_t *tree_conflicted, in wrap_4to3_file_opened()
1852 svn_boolean_t *tree_conflicted, in wrap_4to3_file_added()
1920 svn_boolean_t *tree_conflicted, in wrap_4to3_dir_added()
1998 wrap_4to3_dir_opened(svn_boolean_t *tree_conflicted, in wrap_4to3_dir_opened()
[all …]
H A Ddiff_editor.c2527 svn_boolean_t tree_conflicted = FALSE; in wrap_dir_opened() local
2583 svn_boolean_t tree_conflicted = FALSE; in wrap_dir_added() local
2625 svn_boolean_t tree_conflicted = FALSE; in wrap_dir_deleted() local
2671 svn_boolean_t tree_conflicted = FALSE; in wrap_dir_changed() local
2705 svn_boolean_t tree_conflicted = FALSE; in wrap_file_opened() local
2736 svn_boolean_t tree_conflicted = FALSE; in wrap_file_added() local
2788 svn_boolean_t tree_conflicted = FALSE; in wrap_file_deleted() local
2823 svn_boolean_t tree_conflicted = FALSE; in wrap_file_changed() local
/dports/devel/py-subversion/subversion-1.14.1/subversion/libsvn_wc/
H A Dconflicts.c707 svn_boolean_t *tree_conflicted, in svn_wc__conflict_read_info()
1897 svn_boolean_t tree_conflicted; in svn_wc__conflict_invoke_resolver() local
2299 svn_boolean_t tree_conflicted; in svn_wc__read_conflicts() local
2700 svn_boolean_t tree_conflicted; in resolve_tree_conflict_on_node() local
3502 svn_boolean_t tree_conflicted; in svn_wc__conflict_tree_update_break_moved_away() local
3590 svn_boolean_t tree_conflicted; in svn_wc__conflict_tree_update_raise_moved_away() local
3667 svn_boolean_t tree_conflicted; in svn_wc__conflict_tree_update_moved_away_node() local
3754 svn_boolean_t tree_conflicted; in svn_wc__conflict_tree_update_incoming_move() local
3823 svn_boolean_t tree_conflicted; in svn_wc__conflict_tree_update_local_add() local
3912 svn_boolean_t tree_conflicted; in svn_wc__guess_incoming_move_target_nodes() local
H A Ddeprecated.c1480 svn_boolean_t *tree_conflicted, in wrap_3to1_file_added()
1537 svn_boolean_t *tree_conflicted, in wrap_3to1_dir_added()
1554 svn_boolean_t *tree_conflicted, in wrap_3to1_dir_deleted()
1675 svn_boolean_t *tree_conflicted, in wrap_3to2_file_added()
1727 svn_boolean_t *tree_conflicted, in wrap_3to2_dir_added()
1745 svn_boolean_t *tree_conflicted, in wrap_3to2_dir_deleted()
1801 wrap_4to3_file_opened(svn_boolean_t *tree_conflicted, in wrap_4to3_file_opened()
1852 svn_boolean_t *tree_conflicted, in wrap_4to3_file_added()
1920 svn_boolean_t *tree_conflicted, in wrap_4to3_dir_added()
1998 wrap_4to3_dir_opened(svn_boolean_t *tree_conflicted, in wrap_4to3_dir_opened()
[all …]
H A Ddiff_editor.c2527 svn_boolean_t tree_conflicted = FALSE; in wrap_dir_opened() local
2583 svn_boolean_t tree_conflicted = FALSE; in wrap_dir_added() local
2625 svn_boolean_t tree_conflicted = FALSE; in wrap_dir_deleted() local
2671 svn_boolean_t tree_conflicted = FALSE; in wrap_dir_changed() local
2705 svn_boolean_t tree_conflicted = FALSE; in wrap_file_opened() local
2736 svn_boolean_t tree_conflicted = FALSE; in wrap_file_added() local
2788 svn_boolean_t tree_conflicted = FALSE; in wrap_file_deleted() local
2823 svn_boolean_t tree_conflicted = FALSE; in wrap_file_changed() local
/dports/security/subversion-gnome-keyring/subversion-1.14.1/subversion/libsvn_wc/
H A Dconflicts.c707 svn_boolean_t *tree_conflicted, in svn_wc__conflict_read_info()
1897 svn_boolean_t tree_conflicted; in svn_wc__conflict_invoke_resolver() local
2299 svn_boolean_t tree_conflicted; in svn_wc__read_conflicts() local
2700 svn_boolean_t tree_conflicted; in resolve_tree_conflict_on_node() local
3502 svn_boolean_t tree_conflicted; in svn_wc__conflict_tree_update_break_moved_away() local
3590 svn_boolean_t tree_conflicted; in svn_wc__conflict_tree_update_raise_moved_away() local
3667 svn_boolean_t tree_conflicted; in svn_wc__conflict_tree_update_moved_away_node() local
3754 svn_boolean_t tree_conflicted; in svn_wc__conflict_tree_update_incoming_move() local
3823 svn_boolean_t tree_conflicted; in svn_wc__conflict_tree_update_local_add() local
3912 svn_boolean_t tree_conflicted; in svn_wc__guess_incoming_move_target_nodes() local
H A Ddeprecated.c1480 svn_boolean_t *tree_conflicted, in wrap_3to1_file_added()
1537 svn_boolean_t *tree_conflicted, in wrap_3to1_dir_added()
1554 svn_boolean_t *tree_conflicted, in wrap_3to1_dir_deleted()
1675 svn_boolean_t *tree_conflicted, in wrap_3to2_file_added()
1727 svn_boolean_t *tree_conflicted, in wrap_3to2_dir_added()
1745 svn_boolean_t *tree_conflicted, in wrap_3to2_dir_deleted()
1801 wrap_4to3_file_opened(svn_boolean_t *tree_conflicted, in wrap_4to3_file_opened()
1852 svn_boolean_t *tree_conflicted, in wrap_4to3_file_added()
1920 svn_boolean_t *tree_conflicted, in wrap_4to3_dir_added()
1998 wrap_4to3_dir_opened(svn_boolean_t *tree_conflicted, in wrap_4to3_dir_opened()
[all …]
H A Ddiff_editor.c2527 svn_boolean_t tree_conflicted = FALSE; in wrap_dir_opened() local
2583 svn_boolean_t tree_conflicted = FALSE; in wrap_dir_added() local
2625 svn_boolean_t tree_conflicted = FALSE; in wrap_dir_deleted() local
2671 svn_boolean_t tree_conflicted = FALSE; in wrap_dir_changed() local
2705 svn_boolean_t tree_conflicted = FALSE; in wrap_file_opened() local
2736 svn_boolean_t tree_conflicted = FALSE; in wrap_file_added() local
2788 svn_boolean_t tree_conflicted = FALSE; in wrap_file_deleted() local
2823 svn_boolean_t tree_conflicted = FALSE; in wrap_file_changed() local
/dports/devel/p5-subversion/subversion-1.14.1/subversion/libsvn_wc/
H A Dconflicts.c707 svn_boolean_t *tree_conflicted, in svn_wc__conflict_read_info()
1897 svn_boolean_t tree_conflicted; in svn_wc__conflict_invoke_resolver() local
2299 svn_boolean_t tree_conflicted; in svn_wc__read_conflicts() local
2700 svn_boolean_t tree_conflicted; in resolve_tree_conflict_on_node() local
3502 svn_boolean_t tree_conflicted; in svn_wc__conflict_tree_update_break_moved_away() local
3590 svn_boolean_t tree_conflicted; in svn_wc__conflict_tree_update_raise_moved_away() local
3667 svn_boolean_t tree_conflicted; in svn_wc__conflict_tree_update_moved_away_node() local
3754 svn_boolean_t tree_conflicted; in svn_wc__conflict_tree_update_incoming_move() local
3823 svn_boolean_t tree_conflicted; in svn_wc__conflict_tree_update_local_add() local
3912 svn_boolean_t tree_conflicted; in svn_wc__guess_incoming_move_target_nodes() local
H A Ddeprecated.c1480 svn_boolean_t *tree_conflicted, in wrap_3to1_file_added()
1537 svn_boolean_t *tree_conflicted, in wrap_3to1_dir_added()
1554 svn_boolean_t *tree_conflicted, in wrap_3to1_dir_deleted()
1675 svn_boolean_t *tree_conflicted, in wrap_3to2_file_added()
1727 svn_boolean_t *tree_conflicted, in wrap_3to2_dir_added()
1745 svn_boolean_t *tree_conflicted, in wrap_3to2_dir_deleted()
1801 wrap_4to3_file_opened(svn_boolean_t *tree_conflicted, in wrap_4to3_file_opened()
1852 svn_boolean_t *tree_conflicted, in wrap_4to3_file_added()
1920 svn_boolean_t *tree_conflicted, in wrap_4to3_dir_added()
1998 wrap_4to3_dir_opened(svn_boolean_t *tree_conflicted, in wrap_4to3_dir_opened()
[all …]
H A Ddiff_editor.c2527 svn_boolean_t tree_conflicted = FALSE; in wrap_dir_opened() local
2583 svn_boolean_t tree_conflicted = FALSE; in wrap_dir_added() local
2625 svn_boolean_t tree_conflicted = FALSE; in wrap_dir_deleted() local
2671 svn_boolean_t tree_conflicted = FALSE; in wrap_dir_changed() local
2705 svn_boolean_t tree_conflicted = FALSE; in wrap_file_opened() local
2736 svn_boolean_t tree_conflicted = FALSE; in wrap_file_added() local
2788 svn_boolean_t tree_conflicted = FALSE; in wrap_file_deleted() local
2823 svn_boolean_t tree_conflicted = FALSE; in wrap_file_changed() local

1234