Searched refs:conflict_remains (Results 1 - 2 of 2) sorted by relevance

/freebsd-10-stable/contrib/subversion/subversion/libsvn_wc/
H A Dprops.c886 svn_boolean_t *conflict_remains,
896 *conflict_remains = FALSE;
940 *conflict_remains = TRUE;
944 *conflict_remains = TRUE;
962 svn_boolean_t *conflict_remains,
968 *conflict_remains = FALSE;
976 *conflict_remains = TRUE;
996 *conflict_remains = TRUE;
1005 *conflict_remains = TRUE;
1020 svn_boolean_t *conflict_remains,
883 apply_single_prop_add(const svn_string_t **result_val, svn_boolean_t *conflict_remains, svn_boolean_t *did_merge, const char *propname, const svn_string_t *pristine_val, const svn_string_t *new_val, const svn_string_t *working_val, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
959 apply_single_prop_delete(const svn_string_t **result_val, svn_boolean_t *conflict_remains, svn_boolean_t *did_merge, const svn_string_t *base_val, const svn_string_t *old_val, const svn_string_t *working_val) argument
1017 apply_single_mergeinfo_prop_change(const svn_string_t **result_val, svn_boolean_t *conflict_remains, svn_boolean_t *did_merge, const svn_string_t *base_val, const svn_string_t *old_val, const svn_string_t *new_val, const svn_string_t *working_val, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
1106 apply_single_generic_prop_change(const svn_string_t **result_val, svn_boolean_t *conflict_remains, svn_boolean_t *did_merge, const svn_string_t *old_val, const svn_string_t *new_val, const svn_string_t *working_val) argument
1153 apply_single_prop_change(const svn_string_t **result_val, svn_boolean_t *conflict_remains, svn_boolean_t *did_merge, const char *propname, const svn_string_t *base_val, const svn_string_t *old_val, const svn_string_t *new_val, const svn_string_t *working_val, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
1272 svn_boolean_t conflict_remains; local
[all...]
H A Dconflicts.c1143 generate_propconflict(svn_boolean_t *conflict_remains,
1314 *conflict_remains = TRUE;
1326 *conflict_remains = TRUE;
1332 *conflict_remains = FALSE;
1343 *conflict_remains = FALSE;
1349 *conflict_remains = FALSE;
1375 *conflict_remains = FALSE;
1380 if (!*conflict_remains)
1921 svn_boolean_t conflict_remains = TRUE;
1928 SVN_ERR(generate_propconflict(&conflict_remains,
1142 generate_propconflict(svn_boolean_t *conflict_remains, svn_wc__db_t *db, const char *local_abspath, svn_node_kind_t kind, svn_wc_operation_t operation, const svn_wc_conflict_version_t *left_version, const svn_wc_conflict_version_t *right_version, const char *propname, const svn_string_t *base_val, const svn_string_t *working_val, const svn_string_t *incoming_old_val, const svn_string_t *incoming_new_val, svn_wc_conflict_resolver_func2_t conflict_func, void *conflict_baton, svn_cancel_func_t cancel_func, void *cancel_baton, apr_pool_t *scratch_pool) argument
1920 svn_boolean_t conflict_remains = TRUE; local
[all...]

Completed in 188 milliseconds