Searched refs:tree_conflicted (Results 1 - 23 of 23) sorted by relevance

/freebsd-11-stable/contrib/subversion/subversion/svn/
H A Dstatus.c257 svn_boolean_t tree_conflicted;
265 &tree_conflicted, ctx->wc_ctx,
273 tree_conflicted = FALSE;
282 tree_conflicted = TRUE;
285 if (tree_conflicted)
479 svn_boolean_t tree_conflicted = FALSE;
486 SVN_ERR(svn_wc_conflicted_p3(NULL, NULL, &tree_conflicted,
513 if (tree_conflicted)
255 svn_boolean_t tree_conflicted; local
477 svn_boolean_t tree_conflicted = FALSE; local
H A Dcl-conflicts.c480 svn_boolean_t tree_conflicted; local
491 &tree_conflicted,
494 if (tree_conflicted)
H A Dconflict-callbacks.c831 svn_boolean_t tree_conflicted,
859 if (tree_conflicted)
1991 svn_boolean_t tree_conflicted;
1996 &tree_conflicted,
2021 if (tree_conflicted)
2044 svn_boolean_t tree_conflicted;
2050 &tree_conflicted,
2082 else if (tree_conflicted)
2097 if (tree_conflicted)
2237 if (tree_conflicted)
826 mark_conflict_resolved(svn_client_conflict_t *conflict, svn_client_conflict_option_id_t option_id, svn_boolean_t text_conflicted, const char *propname, svn_boolean_t tree_conflicted, const char *path_prefix, svn_cl__conflict_stats_t *conflict_stats, svn_client_ctx_t *ctx, apr_pool_t *scratch_pool) argument
1990 svn_boolean_t tree_conflicted; local
2043 svn_boolean_t tree_conflicted; local
[all...]
H A Dinfo-cmd.c895 svn_boolean_t tree_conflicted;
904 &tree_conflicted,
960 if (tree_conflicted)
893 svn_boolean_t tree_conflicted; local
/freebsd-11-stable/contrib/subversion/subversion/libsvn_wc/
H A Ddeprecated.c1446 svn_boolean_t *tree_conflicted,
1460 if (tree_conflicted)
1461 *tree_conflicted = FALSE;
1481 svn_boolean_t *tree_conflicted,
1495 if (tree_conflicted)
1496 *tree_conflicted = FALSE;
1513 svn_boolean_t *tree_conflicted,
1524 if (tree_conflicted)
1525 *tree_conflicted = FALSE;
1538 svn_boolean_t *tree_conflicted,
1442 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
1477 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
1510 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
1535 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
1552 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
1568 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
1588 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
1603 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
1643 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
1672 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
1701 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
1725 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
1743 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
1760 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
1801 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
1814 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
1850 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
1888 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
1919 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
1947 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
1970 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
1998 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
2025 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 Dquestions.c536 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 Dconflicts.c708 svn_boolean_t *tree_conflicted,
773 if (tree_conflicted)
779 *tree_conflicted = (c_skel != NULL);
1898 svn_boolean_t tree_conflicted;
1906 &tree_conflicted,
2049 if (tree_conflicted)
2300 svn_boolean_t tree_conflicted;
2327 &prop_conflicted, &tree_conflicted,
2361 if (tree_conflicted)
2702 svn_boolean_t tree_conflicted;
703 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
1897 svn_boolean_t tree_conflicted; local
2299 svn_boolean_t tree_conflicted; local
2700 svn_boolean_t tree_conflicted; local
3502 svn_boolean_t tree_conflicted; local
3590 svn_boolean_t tree_conflicted; local
3667 svn_boolean_t tree_conflicted; local
3754 svn_boolean_t tree_conflicted; local
3823 svn_boolean_t tree_conflicted; local
3912 svn_boolean_t tree_conflicted; local
[all...]
H A Ddiff_editor.c2530 svn_boolean_t tree_conflicted = FALSE;
2535 /* Maybe store state and tree_conflicted in baton? */
2539 SVN_ERR(wb->callbacks->dir_opened(&tree_conflicted, skip, skip_children,
2555 SVN_ERR(wb->callbacks->dir_added(&state, &tree_conflicted,
2586 svn_boolean_t tree_conflicted = FALSE;
2601 &tree_conflicted,
2610 &tree_conflicted,
2628 svn_boolean_t tree_conflicted = FALSE;
2631 SVN_ERR(wb->callbacks->dir_deleted(&state, &tree_conflicted,
2674 svn_boolean_t tree_conflicted
2527 svn_boolean_t tree_conflicted = FALSE; local
2583 svn_boolean_t tree_conflicted = FALSE; local
2625 svn_boolean_t tree_conflicted = FALSE; local
2671 svn_boolean_t tree_conflicted = FALSE; local
2705 svn_boolean_t tree_conflicted = FALSE; local
2736 svn_boolean_t tree_conflicted = FALSE; local
2788 svn_boolean_t tree_conflicted = FALSE; local
2823 svn_boolean_t tree_conflicted = FALSE; local
[all...]
H A Dinfo.c484 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 Dconflicts.h312 svn_boolean_t *tree_conflicted,
H A Dstatus.c507 svn_boolean_t text_conflicted, prop_conflicted, tree_conflicted;
512 &tree_conflicted,
515 if (!text_conflicted && !prop_conflicted && !tree_conflicted)
721 svn_boolean_t tree_conflicted,
769 else if (tree_conflicted)
783 stat->conflicted = tree_conflicted;
989 svn_boolean_t tree_conflicted,
1004 dirent, tree_conflicted,
504 svn_boolean_t text_conflicted, prop_conflicted, tree_conflicted; local
714 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
983 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 Dmerge.c1272 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 Dprops.c220 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 Dwc_db_update_move.c454 svn_boolean_t tree_conflicted; local
457 &tree_conflicted,
468 if (tree_conflicted)
4082 svn_boolean_t tree_conflicted; local
4096 &tree_conflicted,
4101 if (text_conflicted || prop_conflicted || !tree_conflicted)
H A Dwc_db.c6816 svn_boolean_t tree_conflicted; local
6829 &tree_conflicted,
6834 if (!tree_conflicted
/freebsd-11-stable/contrib/subversion/subversion/include/
H A Dsvn_wc.h2321 * If @a tree_conflicted is non-NULL, set @a *tree_conflicted to true if
2335 svn_error_t *(*file_opened)(svn_boolean_t *tree_conflicted,
2361 svn_boolean_t *tree_conflicted,
2395 svn_boolean_t *tree_conflicted,
2422 svn_boolean_t *tree_conflicted,
2436 svn_boolean_t *tree_conflicted,
2450 svn_error_t *(*dir_opened)(svn_boolean_t *tree_conflicted,
2470 svn_boolean_t *tree_conflicted,
2490 svn_boolean_t *tree_conflicted,
[all...]
H A Dsvn_client.h4910 svn_boolean_t *tree_conflicted,
/freebsd-11-stable/contrib/subversion/subversion/libsvn_client/
H A Drepos_diff.c100 svn_boolean_t tree_conflicted; member in struct:deleted_path_notify_t
111 svn_boolean_t tree_conflicted; member in struct:dir_baton
164 svn_boolean_t tree_conflicted; member in struct:file_baton
238 dir_baton->tree_conflicted = FALSE;
292 file_baton->tree_conflicted = FALSE;
H A Dstatus.c834 svn_boolean_t text_conflicted, prop_conflicted, tree_conflicted;
840 &tree_conflicted, wc_ctx, local_abspath,
831 svn_boolean_t text_conflicted, prop_conflicted, tree_conflicted; local
H A Dadd.c853 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 Dcommit_util.c301 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
H A Dconflicts.c9891 svn_boolean_t tree_conflicted;
9893 SVN_ERR(svn_client_conflict_get_conflicted(NULL, NULL, &tree_conflicted,
9897 SVN_ERR_ASSERT(tree_conflicted); /* ### return proper error? */
12926 svn_boolean_t *tree_conflicted,
12944 if (tree_conflicted)
12945 *tree_conflicted = (conflict->legacy_tree_conflict != NULL);
13188 svn_boolean_t tree_conflicted;
13194 SVN_ERR(svn_client_conflict_get_conflicted(NULL, NULL, &tree_conflicted,
13197 if (!tree_conflicted)
13369 svn_boolean_t tree_conflicted;
9889 svn_boolean_t tree_conflicted; local
12922 svn_client_conflict_get_conflicted(svn_boolean_t *text_conflicted, apr_array_header_t **props_conflicted, svn_boolean_t *tree_conflicted, svn_client_conflict_t *conflict, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
13186 svn_boolean_t tree_conflicted; local
13367 svn_boolean_t tree_conflicted; local
[all...]
/freebsd-11-stable/contrib/subversion/subversion/include/private/
H A Dsvn_wc_private.h1688 (*svn_wc__diff_state_handle_t)(svn_boolean_t tree_conflicted,

Completed in 506 milliseconds