Searched refs:text_conflicted (Results 1 - 11 of 11) sorted by relevance
| /freebsd-11.0-release/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;
298 else if (text_conflicted)
253 svn_boolean_t text_conflicted; local
|
| /freebsd-11.0-release/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 | 304 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 | 689 svn_boolean_t *text_conflicted,
738 if (text_conflicted)
744 *text_conflicted = (c_skel != NULL);
1845 svn_boolean_t text_conflicted;
1854 &text_conflicted, &prop_conflicted,
1946 if (text_conflicted)
2248 svn_boolean_t text_conflicted;
2275 SVN_ERR(svn_wc__conflict_read_info(&operation, &locations, &text_conflicted,
2297 if (text_conflicted && !only_tree_conflict)
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
1844 svn_boolean_t text_conflicted; local
2247 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 | 506 svn_boolean_t text_conflicted, prop_conflicted, tree_conflicted;
510 SVN_ERR(svn_wc__internal_conflicted_p(&text_conflicted, &prop_conflicted,
514 if (!text_conflicted && !prop_conflicted && !tree_conflicted)
503 svn_boolean_t text_conflicted, prop_conflicted, tree_conflicted; local
|
| H A D | wc_db_update_move.c | 2290 svn_boolean_t text_conflicted; local
2305 &text_conflicted, &prop_conflicted,
2311 if (text_conflicted || prop_conflicted || !tree_conflicted)
|
| /freebsd-11.0-release/contrib/subversion/subversion/libsvn_client/ |
| H A D | status.c | 754 svn_boolean_t text_conflicted, prop_conflicted, tree_conflicted;
759 SVN_ERR(svn_wc_conflicted_p3(&text_conflicted, &prop_conflicted,
763 if (text_conflicted)
770 if (text_conflicted || prop_conflicted)
751 svn_boolean_t text_conflicted, prop_conflicted, tree_conflicted; local
|
| H A D | update.c | 274 svn_boolean_t text_conflicted, prop_conflicted;
279 err = svn_wc_conflicted_p3(&text_conflicted, &prop_conflicted,
288 if (!err && (text_conflicted || prop_conflicted))
272 svn_boolean_t text_conflicted, prop_conflicted; local
|
Completed in 266 milliseconds