Home
last modified time | relevance | path

Searched refs:prop_conflicted (Results 1 – 25 of 48) sorted by relevance

12

/dports/java/java-subversion/subversion-1.14.1/subversion/svn/
H A Dstatus.c254 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()
/dports/devel/py-subversion/subversion-1.14.1/subversion/svn/
H A Dstatus.c254 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()
/dports/security/subversion-gnome-keyring/subversion-1.14.1/subversion/svn/
H A Dstatus.c254 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()
/dports/devel/p5-subversion/subversion-1.14.1/subversion/svn/
H A Dstatus.c254 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()
/dports/java/java-subversion/subversion-1.14.1/subversion/libsvn_wc/
H A Dconflicts.c763 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
1105 if (prop_conflicted) in svn_wc__conflict_create_markers()
1896 svn_boolean_t prop_conflicted; in svn_wc__conflict_invoke_resolver() local
1922 if (prop_conflicted) in svn_wc__conflict_invoke_resolver()
2122 svn_boolean_t prop_conflicted; in read_prop_conflict_descs() local
2128 if (!prop_conflicted) in read_prop_conflict_descs()
2297 svn_boolean_t prop_conflicted; in svn_wc__read_conflicts() local
2448 svn_boolean_t prop_conflicted; in resolve_prop_conflict_on_node() local
[all …]
H A Dmerge.c1270 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()
H A Dquestions.c533 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()
H A Dconflicts.h311 svn_boolean_t *prop_conflicted,
/dports/devel/py-subversion/subversion-1.14.1/subversion/libsvn_wc/
H A Dconflicts.c763 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
1105 if (prop_conflicted) in svn_wc__conflict_create_markers()
1896 svn_boolean_t prop_conflicted; in svn_wc__conflict_invoke_resolver() local
1922 if (prop_conflicted) in svn_wc__conflict_invoke_resolver()
2122 svn_boolean_t prop_conflicted; in read_prop_conflict_descs() local
2128 if (!prop_conflicted) in read_prop_conflict_descs()
2297 svn_boolean_t prop_conflicted; in svn_wc__read_conflicts() local
2448 svn_boolean_t prop_conflicted; in resolve_prop_conflict_on_node() local
[all …]
H A Dmerge.c1270 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()
H A Dquestions.c533 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()
/dports/security/subversion-gnome-keyring/subversion-1.14.1/subversion/libsvn_wc/
H A Dconflicts.c763 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
1105 if (prop_conflicted) in svn_wc__conflict_create_markers()
1896 svn_boolean_t prop_conflicted; in svn_wc__conflict_invoke_resolver() local
1922 if (prop_conflicted) in svn_wc__conflict_invoke_resolver()
2122 svn_boolean_t prop_conflicted; in read_prop_conflict_descs() local
2128 if (!prop_conflicted) in read_prop_conflict_descs()
2297 svn_boolean_t prop_conflicted; in svn_wc__read_conflicts() local
2448 svn_boolean_t prop_conflicted; in resolve_prop_conflict_on_node() local
[all …]
H A Dmerge.c1270 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()
H A Dquestions.c533 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()
/dports/devel/p5-subversion/subversion-1.14.1/subversion/libsvn_wc/
H A Dconflicts.c763 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
1105 if (prop_conflicted) in svn_wc__conflict_create_markers()
1896 svn_boolean_t prop_conflicted; in svn_wc__conflict_invoke_resolver() local
1922 if (prop_conflicted) in svn_wc__conflict_invoke_resolver()
2122 svn_boolean_t prop_conflicted; in read_prop_conflict_descs() local
2128 if (!prop_conflicted) in read_prop_conflict_descs()
2297 svn_boolean_t prop_conflicted; in svn_wc__read_conflicts() local
2448 svn_boolean_t prop_conflicted; in resolve_prop_conflict_on_node() local
[all …]
H A Dmerge.c1270 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()
H A Dquestions.c533 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()
/dports/java/java-subversion/subversion-1.14.1/subversion/libsvn_client/
H A Dstatus.c831 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()
H A Dupdate.c354 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()
/dports/devel/py-subversion/subversion-1.14.1/subversion/libsvn_client/
H A Dstatus.c831 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()
H A Dupdate.c354 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()
/dports/security/subversion-gnome-keyring/subversion-1.14.1/subversion/libsvn_client/
H A Dstatus.c831 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()
H A Dupdate.c354 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()
/dports/devel/p5-subversion/subversion-1.14.1/subversion/libsvn_client/
H A Dstatus.c831 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()
H A Dupdate.c354 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()

12