Searched refs:text_conflicted (Results 1 - 10 of 10) sorted by relevance
/freebsd-10.0-release/contrib/subversion/subversion/svn/ |
H A D | status.c | 242 svn_boolean_t text_conflicted; 250 err = svn_wc_conflicted_p3(&text_conflicted, 258 text_conflicted = FALSE; 267 text_conflicted = FALSE; 285 else if (text_conflicted) 240 svn_boolean_t text_conflicted; local
|
/freebsd-10.0-release/contrib/subversion/subversion/libsvn_wc/ |
H A D | questions.c | 543 svn_boolean_t text_conflicted, prop_conflicted, tree_conflicted; 549 SVN_ERR(internal_conflicted_p(tree_only ? NULL: &text_conflicted, 556 *conflicted_p = text_conflicted || prop_conflicted || tree_conflicted; 540 svn_boolean_t text_conflicted, prop_conflicted, tree_conflicted; local
|
H A D | conflicts.h | 304 svn_boolean_t *text_conflicted,
|
H A D | merge.c | 1266 svn_boolean_t text_conflicted; 1270 SVN_ERR(svn_wc__internal_conflicted_p(&text_conflicted, 1278 if (text_conflicted || prop_conflicted || tree_conflicted) 1402 svn_boolean_t text_conflicted, prop_conflicted; 1413 &text_conflicted, &prop_conflicted, NULL, 1419 && ! text_conflicted) 1265 svn_boolean_t text_conflicted; local 1401 svn_boolean_t text_conflicted, prop_conflicted; local
|
H A D | conflicts.c | 692 svn_boolean_t *text_conflicted, 741 if (text_conflicted) 747 *text_conflicted = (c_skel != NULL); 1873 svn_boolean_t text_conflicted; 1882 &text_conflicted, &prop_conflicted, 1972 if (text_conflicted) 2222 svn_boolean_t text_conflicted; 2240 SVN_ERR(svn_wc__conflict_read_info(&operation, &locations, &text_conflicted, 2264 if (text_conflicted) 2387 svn_boolean_t text_conflicted; 689 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 1872 svn_boolean_t text_conflicted; local 2221 svn_boolean_t text_conflicted; local 2385 svn_boolean_t text_conflicted; local [all...] |
H A D | props.c | 243 svn_boolean_t text_conflicted; 247 SVN_ERR(svn_wc__internal_conflicted_p(&text_conflicted, 255 if (text_conflicted || prop_conflicted || tree_conflicted) 241 svn_boolean_t text_conflicted; local
|
H A D | entries.c | 883 svn_boolean_t text_conflicted; 888 SVN_ERR(svn_wc__conflict_read_info(NULL, NULL, &text_conflicted, 893 if (text_conflicted) 882 svn_boolean_t text_conflicted; local
|
H A D | status.c | 637 svn_boolean_t text_conflicted, prop_conflicted, tree_conflicted; 641 SVN_ERR(svn_wc__internal_conflicted_p(&text_conflicted, &prop_conflicted, 645 if (!text_conflicted && !prop_conflicted && !tree_conflicted) 635 svn_boolean_t text_conflicted, prop_conflicted, tree_conflicted; local
|
/freebsd-10.0-release/contrib/subversion/subversion/libsvn_client/ |
H A D | status.c | 745 svn_boolean_t text_conflicted, prop_conflicted, tree_conflicted; 750 SVN_ERR(svn_wc_conflicted_p3(&text_conflicted, &prop_conflicted, 754 if (text_conflicted) 761 if (text_conflicted || prop_conflicted) 742 svn_boolean_t text_conflicted, prop_conflicted, tree_conflicted; local
|
H A D | update.c | 268 svn_boolean_t text_conflicted, prop_conflicted; 273 err = svn_wc_conflicted_p3(&text_conflicted, &prop_conflicted, 282 if (!err && (text_conflicted || prop_conflicted)) 266 svn_boolean_t text_conflicted, prop_conflicted; local
|
Completed in 521 milliseconds