H A D | conflicts.c | 59 * Conflict skel management 84 _("Not a conflict skel")); 96 /* Serialize a svn_wc_conflict_version_t before the existing data in skel */ 98 conflict__prepend_location(svn_skel_t *skel, 109 svn_skel__prepend(svn_skel__make_empty_list(result_pool), skel); 134 svn_skel__prepend(loc, skel); 138 /* Deserialize a svn_wc_conflict_version_t from the skel. 142 const svn_skel_t *skel, 154 const svn_skel_t *c = skel->children; 362 /* Current skel forma 97 conflict__prepend_location(svn_skel_t *skel, const svn_wc_conflict_version_t *location, svn_boolean_t allow_NULL, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument 108 svn_skel__prepend(svn_skel__make_empty_list(result_pool), skel); local 140 conflict__read_location(svn_wc_conflict_version_t **location, const svn_skel_t *skel, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument 1067 prepend_prop_value(const svn_string_t *value, svn_skel_t *skel, apr_pool_t *result_pool) argument 1087 prop_conflict_skel_add( svn_skel_t *skel, const char *prop_name, const svn_string_t *original_value, const svn_string_t *mine_value, const svn_string_t *incoming_value, const svn_string_t *incoming_base_value, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument [all...] |