/freebsd-11.0-release/contrib/subversion/subversion/svn/ |
H A D | status.c | 257 svn_boolean_t tree_conflicted; 265 &tree_conflicted, ctx->wc_ctx, 273 tree_conflicted = FALSE; 282 tree_conflicted = TRUE; 285 if (tree_conflicted) 480 svn_boolean_t tree_conflicted = FALSE; 487 SVN_ERR(svn_wc_conflicted_p3(NULL, NULL, &tree_conflicted, 514 if (tree_conflicted) 255 svn_boolean_t tree_conflicted; local 478 svn_boolean_t tree_conflicted = FALSE; local
|
/freebsd-11.0-release/contrib/subversion/subversion/libsvn_wc/ |
H A D | deprecated.c | 1389 svn_boolean_t *tree_conflicted, 1403 if (tree_conflicted) 1404 *tree_conflicted = FALSE; 1424 svn_boolean_t *tree_conflicted, 1438 if (tree_conflicted) 1439 *tree_conflicted = FALSE; 1456 svn_boolean_t *tree_conflicted, 1467 if (tree_conflicted) 1468 *tree_conflicted = FALSE; 1481 svn_boolean_t *tree_conflicted, 1385 wrap_3to1_file_changed(svn_wc_adm_access_t *adm_access, svn_wc_notify_state_t *contentstate, svn_wc_notify_state_t *propstate, svn_boolean_t *tree_conflicted, const char *path, const char *tmpfile1, const char *tmpfile2, svn_revnum_t rev1, svn_revnum_t rev2, const char *mimetype1, const char *mimetype2, const apr_array_header_t *propchanges, apr_hash_t *originalprops, void *diff_baton) argument 1420 wrap_3to1_file_added(svn_wc_adm_access_t *adm_access, svn_wc_notify_state_t *contentstate, svn_wc_notify_state_t *propstate, svn_boolean_t *tree_conflicted, const char *path, const char *tmpfile1, const char *tmpfile2, svn_revnum_t rev1, svn_revnum_t rev2, const char *mimetype1, const char *mimetype2, const apr_array_header_t *propchanges, apr_hash_t *originalprops, void *diff_baton) argument 1453 wrap_3to1_file_deleted(svn_wc_adm_access_t *adm_access, svn_wc_notify_state_t *state, svn_boolean_t *tree_conflicted, const char *path, const char *tmpfile1, const char *tmpfile2, const char *mimetype1, const char *mimetype2, apr_hash_t *originalprops, void *diff_baton) argument 1478 wrap_3to1_dir_added(svn_wc_adm_access_t *adm_access, svn_wc_notify_state_t *state, svn_boolean_t *tree_conflicted, const char *path, svn_revnum_t rev, void *diff_baton) argument 1495 wrap_3to1_dir_deleted(svn_wc_adm_access_t *adm_access, svn_wc_notify_state_t *state, svn_boolean_t *tree_conflicted, const char *path, void *diff_baton) argument 1511 wrap_3to1_dir_props_changed(svn_wc_adm_access_t *adm_access, svn_wc_notify_state_t *state, svn_boolean_t *tree_conflicted, const char *path, const apr_array_header_t *propchanges, apr_hash_t *originalprops, void *diff_baton) argument 1531 wrap_3to1or2_dir_opened(svn_wc_adm_access_t *adm_access, svn_boolean_t *tree_conflicted, const char *path, svn_revnum_t rev, void *diff_baton) argument 1546 wrap_3to1or2_dir_closed(svn_wc_adm_access_t *adm_access, svn_wc_notify_state_t *propstate, svn_wc_notify_state_t *contentstate, svn_boolean_t *tree_conflicted, const char *path, void *diff_baton) argument 1586 wrap_3to2_file_changed(svn_wc_adm_access_t *adm_access, svn_wc_notify_state_t *contentstate, svn_wc_notify_state_t *propstate, svn_boolean_t *tree_conflicted, const char *path, const char *tmpfile1, const char *tmpfile2, svn_revnum_t rev1, svn_revnum_t rev2, const char *mimetype1, const char *mimetype2, const apr_array_header_t *propchanges, apr_hash_t *originalprops, void *diff_baton) argument 1615 wrap_3to2_file_added(svn_wc_adm_access_t *adm_access, svn_wc_notify_state_t *contentstate, svn_wc_notify_state_t *propstate, svn_boolean_t *tree_conflicted, const char *path, const char *tmpfile1, const char *tmpfile2, svn_revnum_t rev1, svn_revnum_t rev2, const char *mimetype1, const char *mimetype2, const apr_array_header_t *propchanges, apr_hash_t *originalprops, void *diff_baton) argument 1644 wrap_3to2_file_deleted(svn_wc_adm_access_t *adm_access, svn_wc_notify_state_t *state, svn_boolean_t *tree_conflicted, const char *path, const char *tmpfile1, const char *tmpfile2, const char *mimetype1, const char *mimetype2, apr_hash_t *originalprops, void *diff_baton) argument 1668 wrap_3to2_dir_added(svn_wc_adm_access_t *adm_access, svn_wc_notify_state_t *state, svn_boolean_t *tree_conflicted, const char *path, svn_revnum_t rev, void *diff_baton) argument 1686 wrap_3to2_dir_deleted(svn_wc_adm_access_t *adm_access, svn_wc_notify_state_t *state, svn_boolean_t *tree_conflicted, const char *path, void *diff_baton) argument 1703 wrap_3to2_dir_props_changed(svn_wc_adm_access_t *adm_access, svn_wc_notify_state_t *state, svn_boolean_t *tree_conflicted, const char *path, const apr_array_header_t *propchanges, apr_hash_t *originalprops, void *diff_baton) argument 1744 wrap_4to3_file_opened(svn_boolean_t *tree_conflicted, svn_boolean_t *skip, const char *path, svn_revnum_t rev, void *diff_baton, apr_pool_t *scratch_pool) argument 1757 wrap_4to3_file_changed(svn_wc_notify_state_t *contentstate, svn_wc_notify_state_t *propstate, svn_boolean_t *tree_conflicted, const char *path, const char *tmpfile1, const char *tmpfile2, svn_revnum_t rev1, svn_revnum_t rev2, const char *mimetype1, const char *mimetype2, const apr_array_header_t *propchanges, apr_hash_t *originalprops, void *diff_baton, apr_pool_t *scratch_pool) argument 1793 wrap_4to3_file_added(svn_wc_notify_state_t *contentstate, svn_wc_notify_state_t *propstate, svn_boolean_t *tree_conflicted, const char *path, const char *tmpfile1, const char *tmpfile2, svn_revnum_t rev1, svn_revnum_t rev2, const char *mimetype1, const char *mimetype2, const char *copyfrom_path, svn_revnum_t copyfrom_revision, const apr_array_header_t *propchanges, apr_hash_t *originalprops, void *diff_baton, apr_pool_t *scratch_pool) argument 1831 wrap_4to3_file_deleted(svn_wc_notify_state_t *state, svn_boolean_t *tree_conflicted, const char *path, const char *tmpfile1, const char *tmpfile2, const char *mimetype1, const char *mimetype2, apr_hash_t *originalprops, void *diff_baton, apr_pool_t *scratch_pool) argument 1862 wrap_4to3_dir_added(svn_wc_notify_state_t *state, svn_boolean_t *tree_conflicted, svn_boolean_t *skip, svn_boolean_t *skip_children, const char *path, svn_revnum_t rev, const char *copyfrom_path, svn_revnum_t copyfrom_revision, void *diff_baton, apr_pool_t *scratch_pool) argument 1890 wrap_4to3_dir_deleted(svn_wc_notify_state_t *state, svn_boolean_t *tree_conflicted, const char *path, void *diff_baton, apr_pool_t *scratch_pool) argument 1913 wrap_4to3_dir_props_changed(svn_wc_notify_state_t *propstate, svn_boolean_t *tree_conflicted, const char *path, svn_boolean_t dir_was_added, const apr_array_header_t *propchanges, apr_hash_t *original_props, void *diff_baton, apr_pool_t *scratch_pool) argument 1941 wrap_4to3_dir_opened(svn_boolean_t *tree_conflicted, svn_boolean_t *skip, svn_boolean_t *skip_children, const char *path, svn_revnum_t rev, void *diff_baton, apr_pool_t *scratch_pool) argument 1968 wrap_4to3_dir_closed(svn_wc_notify_state_t *contentstate, svn_wc_notify_state_t *propstate, svn_boolean_t *tree_conflicted, const char *path, svn_boolean_t dir_was_added, void *diff_baton, apr_pool_t *scratch_pool) argument [all...] |
H A D | questions.c | 536 svn_boolean_t text_conflicted, prop_conflicted, tree_conflicted; 544 &tree_conflicted, conflict_ignored_p, 547 *conflicted_p = tree_conflicted; 549 *conflicted_p = text_conflicted || prop_conflicted || tree_conflicted; 533 svn_boolean_t text_conflicted, prop_conflicted, tree_conflicted; local
|
H A D | diff_editor.c | 2408 svn_boolean_t tree_conflicted = FALSE; 2413 /* Maybe store state and tree_conflicted in baton? */ 2417 SVN_ERR(wb->callbacks->dir_opened(&tree_conflicted, skip, skip_children, 2433 SVN_ERR(wb->callbacks->dir_added(&state, &tree_conflicted, 2464 svn_boolean_t tree_conflicted = FALSE; 2479 &tree_conflicted, 2488 &tree_conflicted, 2506 svn_boolean_t tree_conflicted = FALSE; 2509 SVN_ERR(wb->callbacks->dir_deleted(&state, &tree_conflicted, 2552 svn_boolean_t tree_conflicted 2405 svn_boolean_t tree_conflicted = FALSE; local 2461 svn_boolean_t tree_conflicted = FALSE; local 2503 svn_boolean_t tree_conflicted = FALSE; local 2549 svn_boolean_t tree_conflicted = FALSE; local 2583 svn_boolean_t tree_conflicted = FALSE; local 2614 svn_boolean_t tree_conflicted = FALSE; local 2666 svn_boolean_t tree_conflicted = FALSE; local 2701 svn_boolean_t tree_conflicted = FALSE; local [all...] |
H A D | info.c | 484 svn_boolean_t tree_conflicted; 487 err2 = svn_wc__internal_conflicted_p(NULL, NULL, &tree_conflicted, 496 else if (err2 || !tree_conflicted) 483 svn_boolean_t tree_conflicted; local
|
H A D | conflicts.h | 306 svn_boolean_t *tree_conflicted,
|
H A D | conflicts.c | 691 svn_boolean_t *tree_conflicted, 756 if (tree_conflicted) 762 *tree_conflicted = (c_skel != NULL); 1847 svn_boolean_t tree_conflicted; 1855 &tree_conflicted, 1998 if (tree_conflicted) 2249 svn_boolean_t tree_conflicted; 2276 &prop_conflicted, &tree_conflicted, 2310 if (tree_conflicted) 2612 svn_boolean_t tree_conflicted; 686 svn_wc__conflict_read_info(svn_wc_operation_t *operation, const apr_array_header_t **locations, svn_boolean_t *text_conflicted, svn_boolean_t *prop_conflicted, svn_boolean_t *tree_conflicted, svn_wc__db_t *db, const char *wri_abspath, const svn_skel_t *conflict_skel, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument 1846 svn_boolean_t tree_conflicted; local 2248 svn_boolean_t tree_conflicted; local 2610 svn_boolean_t tree_conflicted; local [all...] |
H A D | status.c | 506 svn_boolean_t text_conflicted, prop_conflicted, tree_conflicted; 511 &tree_conflicted, 514 if (!text_conflicted && !prop_conflicted && !tree_conflicted) 718 svn_boolean_t tree_conflicted, 766 else if (tree_conflicted) 780 stat->conflicted = tree_conflicted; 986 svn_boolean_t tree_conflicted, 1001 dirent, tree_conflicted, 503 svn_boolean_t text_conflicted, prop_conflicted, tree_conflicted; local 711 assemble_unversioned(svn_wc__internal_status_t **status, svn_wc__db_t *db, const char *local_abspath, const svn_io_dirent2_t *dirent, svn_boolean_t tree_conflicted, svn_boolean_t is_ignored, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument 980 send_unversioned_item(const struct walk_status_baton *wb, const char *local_abspath, const svn_io_dirent2_t *dirent, svn_boolean_t tree_conflicted, const apr_array_header_t *patterns, svn_boolean_t no_ignore, svn_wc_status_func4_t status_func, void *status_baton, apr_pool_t *scratch_pool) argument
|
H A D | merge.c | 1272 svn_boolean_t tree_conflicted; 1276 &tree_conflicted, 1282 if (text_conflicted || prop_conflicted || tree_conflicted) 1271 svn_boolean_t tree_conflicted; local
|
H A D | wc_db_update_move.c | 394 svn_boolean_t tree_conflicted; local 397 &tree_conflicted, 408 if (tree_conflicted) 2292 svn_boolean_t tree_conflicted; local 2306 &tree_conflicted, 2311 if (text_conflicted || prop_conflicted || !tree_conflicted)
|
H A D | props.c | 220 svn_boolean_t tree_conflicted; 224 &tree_conflicted, 230 if (text_conflicted || prop_conflicted || tree_conflicted) 218 svn_boolean_t tree_conflicted; local
|
H A D | wc_db.c | 6815 svn_boolean_t tree_conflicted; local 6828 &tree_conflicted, 6833 if (!tree_conflicted
|
/freebsd-11.0-release/contrib/subversion/subversion/include/ |
H A D | svn_wc.h | 2287 * If @a tree_conflicted is non-NULL, set @a *tree_conflicted to true if 2301 svn_error_t *(*file_opened)(svn_boolean_t *tree_conflicted, 2327 svn_boolean_t *tree_conflicted, 2361 svn_boolean_t *tree_conflicted, 2388 svn_boolean_t *tree_conflicted, 2402 svn_boolean_t *tree_conflicted, 2416 svn_error_t *(*dir_opened)(svn_boolean_t *tree_conflicted, 2436 svn_boolean_t *tree_conflicted, 2456 svn_boolean_t *tree_conflicted, [all...] |
/freebsd-11.0-release/contrib/subversion/subversion/libsvn_client/ |
H A D | repos_diff.c | 99 svn_boolean_t tree_conflicted; member in struct:deleted_path_notify_t 110 svn_boolean_t tree_conflicted; member in struct:dir_baton 163 svn_boolean_t tree_conflicted; member in struct:file_baton 237 dir_baton->tree_conflicted = FALSE; 291 file_baton->tree_conflicted = FALSE;
|
H A D | status.c | 754 svn_boolean_t text_conflicted, prop_conflicted, tree_conflicted; 760 &tree_conflicted, wc_ctx, local_abspath, 751 svn_boolean_t text_conflicted, prop_conflicted, tree_conflicted; local
|
H A D | add.c | 853 svn_boolean_t tree_conflicted; 857 err = svn_wc_conflicted_p3(NULL, NULL, &tree_conflicted, 862 else if (tree_conflicted) 851 svn_boolean_t tree_conflicted; local
|
H A D | commit_util.c | 301 svn_boolean_t tree_conflicted; 304 SVN_ERR(svn_wc_conflicted_p3(NULL, NULL, &tree_conflicted, 306 if (tree_conflicted) 300 svn_boolean_t tree_conflicted; local
|
/freebsd-11.0-release/contrib/subversion/subversion/include/private/ |
H A D | svn_wc_private.h | 1634 (*svn_wc__diff_state_handle_t)(svn_boolean_t tree_conflicted,
|