Searched refs:conflict_remains (Results 1 – 2 of 2) sorted by relevance
884 svn_boolean_t *conflict_remains, in apply_single_prop_add() argument894 *conflict_remains = FALSE; in apply_single_prop_add()938 *conflict_remains = TRUE; in apply_single_prop_add()942 *conflict_remains = TRUE; in apply_single_prop_add()960 svn_boolean_t *conflict_remains, in apply_single_prop_delete() argument966 *conflict_remains = FALSE; in apply_single_prop_delete()974 *conflict_remains = TRUE; in apply_single_prop_delete()994 *conflict_remains = TRUE; in apply_single_prop_delete()1003 *conflict_remains = TRUE; in apply_single_prop_delete()1018 svn_boolean_t *conflict_remains, in apply_single_mergeinfo_prop_change() argument[all …]
1177 generate_propconflict(svn_boolean_t *conflict_remains, in generate_propconflict() argument1348 *conflict_remains = TRUE; in generate_propconflict()1360 *conflict_remains = TRUE; in generate_propconflict()1366 *conflict_remains = FALSE; in generate_propconflict()1377 *conflict_remains = FALSE; in generate_propconflict()1383 *conflict_remains = FALSE; in generate_propconflict()1409 *conflict_remains = FALSE; in generate_propconflict()1414 if (!*conflict_remains) in generate_propconflict()1955 svn_boolean_t conflict_remains = TRUE; in svn_wc__conflict_invoke_resolver() local1962 SVN_ERR(generate_propconflict(&conflict_remains, in svn_wc__conflict_invoke_resolver()[all …]