| /freebsd-12-stable/contrib/subversion/subversion/svn/ |
| H A D | status.c | 255 svn_boolean_t text_conflicted;
263 err = svn_wc_conflicted_p3(&text_conflicted,
271 text_conflicted = FALSE;
280 text_conflicted = FALSE;
297 else if (text_conflicted)
253 svn_boolean_t text_conflicted; local
|
| H A D | cl-conflicts.c | 478 svn_boolean_t text_conflicted; local
489 SVN_ERR(svn_client_conflict_get_conflicted(&text_conflicted,
512 if (text_conflicted)
|
| H A D | conflict-callbacks.c | 829 svn_boolean_t text_conflicted,
842 if (text_conflicted)
1989 svn_boolean_t text_conflicted;
1994 SVN_ERR(svn_client_conflict_get_conflicted(&text_conflicted,
2009 if (text_conflicted
2042 svn_boolean_t text_conflicted;
2048 SVN_ERR(svn_client_conflict_get_conflicted(&text_conflicted,
2072 if (text_conflicted)
2188 if (text_conflicted)
2289 text_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
1988 svn_boolean_t text_conflicted; local
2041 svn_boolean_t text_conflicted; local
[all...] |
| H A D | info-cmd.c | 893 svn_boolean_t text_conflicted;
902 SVN_ERR(svn_client_conflict_get_conflicted(&text_conflicted,
906 if (text_conflicted)
891 svn_boolean_t text_conflicted; local
|
| /freebsd-12-stable/contrib/subversion/subversion/libsvn_wc/ |
| H A D | questions.c | 536 svn_boolean_t text_conflicted, prop_conflicted, tree_conflicted;
542 SVN_ERR(internal_conflicted_p(tree_only ? NULL: &text_conflicted,
549 *conflicted_p = text_conflicted || prop_conflicted || tree_conflicted;
533 svn_boolean_t text_conflicted, prop_conflicted, tree_conflicted; local
|
| H A D | conflicts.h | 310 svn_boolean_t *text_conflicted,
|
| H A D | merge.c | 1270 svn_boolean_t text_conflicted;
1274 SVN_ERR(svn_wc__internal_conflicted_p(&text_conflicted,
1282 if (text_conflicted || prop_conflicted || tree_conflicted)
1406 svn_boolean_t text_conflicted, prop_conflicted;
1417 &text_conflicted, &prop_conflicted, NULL,
1423 && ! text_conflicted)
1269 svn_boolean_t text_conflicted; local
1405 svn_boolean_t text_conflicted, prop_conflicted; local
|
| H A D | conflicts.c | 706 svn_boolean_t *text_conflicted,
755 if (text_conflicted)
761 *text_conflicted = (c_skel != NULL);
1896 svn_boolean_t text_conflicted;
1905 &text_conflicted, &prop_conflicted,
1997 if (text_conflicted)
2299 svn_boolean_t text_conflicted;
2326 SVN_ERR(svn_wc__conflict_read_info(&operation, &locations, &text_conflicted,
2348 if (text_conflicted && !only_tree_conflict)
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
1895 svn_boolean_t text_conflicted; local
2298 svn_boolean_t text_conflicted; local
|
| H A D | props.c | 218 svn_boolean_t text_conflicted;
222 SVN_ERR(svn_wc__internal_conflicted_p(&text_conflicted,
230 if (text_conflicted || prop_conflicted || tree_conflicted)
216 svn_boolean_t text_conflicted; local
|
| H A D | entries.c | 941 svn_boolean_t text_conflicted;
947 SVN_ERR(svn_wc__conflict_read_info(NULL, NULL, &text_conflicted,
952 if (text_conflicted)
940 svn_boolean_t text_conflicted; local
|
| H A D | status.c | 507 svn_boolean_t text_conflicted, prop_conflicted, tree_conflicted;
511 SVN_ERR(svn_wc__internal_conflicted_p(&text_conflicted, &prop_conflicted,
515 if (!text_conflicted && !prop_conflicted && !tree_conflicted)
504 svn_boolean_t text_conflicted, prop_conflicted, tree_conflicted; local
|
| H A D | wc_db_update_move.c | 4080 svn_boolean_t text_conflicted; local
4095 &text_conflicted, &prop_conflicted,
4101 if (text_conflicted || prop_conflicted || !tree_conflicted)
|
| /freebsd-12-stable/contrib/subversion/subversion/libsvn_client/ |
| H A D | status.c | 834 svn_boolean_t text_conflicted, prop_conflicted, tree_conflicted;
839 SVN_ERR(svn_wc_conflicted_p3(&text_conflicted, &prop_conflicted,
843 if (text_conflicted)
850 if (text_conflicted || prop_conflicted)
831 svn_boolean_t text_conflicted, prop_conflicted, tree_conflicted; local
|
| H A D | update.c | 356 svn_boolean_t text_conflicted, prop_conflicted;
361 err = svn_wc_conflicted_p3(&text_conflicted, &prop_conflicted,
370 if (!err && (text_conflicted || prop_conflicted))
354 svn_boolean_t text_conflicted, prop_conflicted; local
|
| H A D | conflicts.c | 9862 svn_boolean_t text_conflicted;
9864 SVN_ERR(svn_client_conflict_get_conflicted(&text_conflicted, NULL, NULL,
9868 SVN_ERR_ASSERT(text_conflicted); /* ### return proper error? */
12924 svn_client_conflict_get_conflicted(svn_boolean_t *text_conflicted,
12931 if (text_conflicted)
12932 *text_conflicted = (conflict->legacy_text_conflict != NULL);
9860 svn_boolean_t text_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
|
| /freebsd-12-stable/contrib/subversion/subversion/include/ |
| H A D | svn_client.h | 4908 svn_client_conflict_get_conflicted(svn_boolean_t *text_conflicted,
|