| /freebsd-11-stable/contrib/subversion/subversion/svn/ |
| HD | status.c | 254 svn_boolean_t prop_conflicted; in print_status() local
262 &prop_conflicted, in print_status()
270 prop_conflicted = FALSE; in print_status()
279 prop_conflicted = FALSE; in print_status()
297 else if (prop_conflicted) in print_status()
|
| /freebsd-11-stable/contrib/subversion/subversion/libsvn_wc/ |
| HD | conflicts.c | 706 svn_boolean_t *prop_conflicted, in svn_wc__conflict_read_info() argument
763 if (prop_conflicted) in svn_wc__conflict_read_info()
769 *prop_conflicted = (c_skel != NULL); in svn_wc__conflict_read_info()
1095 svn_boolean_t prop_conflicted; in svn_wc__conflict_create_markers() local
1100 NULL, &prop_conflicted, NULL, in svn_wc__conflict_create_markers()
1105 if (prop_conflicted) in svn_wc__conflict_create_markers()
1896 svn_boolean_t prop_conflicted; in svn_wc__conflict_invoke_resolver() local
1904 &text_conflicted, &prop_conflicted, in svn_wc__conflict_invoke_resolver()
1922 if (prop_conflicted) in svn_wc__conflict_invoke_resolver()
2122 svn_boolean_t prop_conflicted; in read_prop_conflict_descs() local
[all …]
|
| HD | merge.c | 1270 svn_boolean_t prop_conflicted; in svn_wc_merge5() local
1274 &prop_conflicted, in svn_wc_merge5()
1281 if (text_conflicted || prop_conflicted || tree_conflicted) in svn_wc_merge5()
1405 svn_boolean_t text_conflicted, prop_conflicted; in svn_wc_merge5() local
1416 &text_conflicted, &prop_conflicted, NULL, in svn_wc_merge5()
1419 && ! prop_conflicted) in svn_wc_merge5()
|
| HD | questions.c | 533 svn_boolean_t text_conflicted, prop_conflicted, tree_conflicted; in svn_wc__conflicted_for_update_p() local
540 tree_only ? NULL: &prop_conflicted, in svn_wc__conflicted_for_update_p()
546 *conflicted_p = text_conflicted || prop_conflicted || tree_conflicted; in svn_wc__conflicted_for_update_p()
|
| HD | conflicts.h | 311 svn_boolean_t *prop_conflicted,
|
| HD | props.c | 217 svn_boolean_t prop_conflicted; in svn_wc_merge_props3() local
221 &prop_conflicted, in svn_wc_merge_props3()
228 if (text_conflicted || prop_conflicted || tree_conflicted) in svn_wc_merge_props3()
328 svn_boolean_t prop_conflicted; in svn_wc_merge_props3() local
339 NULL, &prop_conflicted, NULL, in svn_wc_merge_props3()
341 if (! prop_conflicted) in svn_wc_merge_props3()
|
| HD | entries.c | 941 svn_boolean_t prop_conflicted; in read_one_entry() local
947 &prop_conflicted, NULL, in read_one_entry()
975 if (prop_conflicted) in read_one_entry()
|
| HD | status.c | 504 svn_boolean_t text_conflicted, prop_conflicted, tree_conflicted; in assemble_status() local
508 SVN_ERR(svn_wc__internal_conflicted_p(&text_conflicted, &prop_conflicted, in assemble_status()
512 if (!text_conflicted && !prop_conflicted && !tree_conflicted) in assemble_status()
|
| HD | wc_db_update_move.c | 4081 svn_boolean_t prop_conflicted; in fetch_conflict_details() local
4095 &text_conflicted, &prop_conflicted, in fetch_conflict_details()
4101 if (text_conflicted || prop_conflicted || !tree_conflicted) in fetch_conflict_details()
|
| /freebsd-11-stable/contrib/subversion/subversion/libsvn_client/ |
| HD | status.c | 831 svn_boolean_t text_conflicted, prop_conflicted, tree_conflicted; in svn_client__create_status() local
836 SVN_ERR(svn_wc_conflicted_p3(&text_conflicted, &prop_conflicted, in svn_client__create_status()
843 if (prop_conflicted) in svn_client__create_status()
847 if (text_conflicted || prop_conflicted) in svn_client__create_status()
|
| HD | update.c | 354 svn_boolean_t text_conflicted, prop_conflicted; in update_internal() local
359 err = svn_wc_conflicted_p3(&text_conflicted, &prop_conflicted, in update_internal()
368 if (!err && (text_conflicted || prop_conflicted)) in update_internal()
|