subversion/libsvn_wc/deprecated.c

2617                            const svn_wc_conflict_description2_t *conflict,
2623   svn_wc_conflict_description_t *cd = svn_wc__cd2_to_cd(conflict,
2891       /* The entry says there was a conflict, but the user might have
3226 conflict_description_dup(const svn_wc_conflict_description_t *conflict,
3234   *new_conflict = *conflict;
3236   if (conflict->path)
3237     new_conflict->path = apr_pstrdup(pool, conflict->path);
3238   if (conflict->property_name)
3239     new_conflict->property_name = apr_pstrdup(pool, conflict->property_name);
3240   if (conflict->mime_type)
3241     new_conflict->mime_type = apr_pstrdup(pool, conflict->mime_type);
3243   if (conflict->base_file)
3244     new_conflict->base_file = apr_pstrdup(pool, conflict->base_file);
3245   if (conflict->their_file)
3246     new_conflict->their_file = apr_pstrdup(pool, conflict->their_file);
3247   if (conflict->my_file)
3248     new_conflict->my_file = apr_pstrdup(pool, conflict->my_file);
3249   if (conflict->merged_file)
3250     new_conflict->merged_file = apr_pstrdup(pool, conflict->merged_file);
3251   if (conflict->src_left_version)
3253       svn_wc_conflict_version_dup(conflict->src_left_version, pool);
3254   if (conflict->src_right_version)
3256       svn_wc_conflict_version_dup(conflict->src_right_version, pool);
4717   svn_wc_conflict_description_t *conflict;
4719   conflict = apr_pcalloc(pool, sizeof(*conflict));
4720   conflict->path = path;
4721   conflict->node_kind = svn_node_file;
4722   conflict->kind = svn_wc_conflict_kind_text;
4723   conflict->access = adm_access;
4724   conflict->action = svn_wc_conflict_action_edit;
4725   conflict->reason = svn_wc_conflict_reason_edited;
4726   return conflict;
4736   svn_wc_conflict_description_t *conflict;
4738   conflict = apr_pcalloc(pool, sizeof(*conflict));
4739   conflict->path = path;
4740   conflict->node_kind = node_kind;
4741   conflict->kind = svn_wc_conflict_kind_property;
4742   conflict->access = adm_access;
4743   conflict->property_name = property_name;
4744   return conflict;
4757   svn_wc_conflict_description_t *conflict;
4759   conflict = apr_pcalloc(pool, sizeof(*conflict));
4760   conflict->path = path;
4761   conflict->node_kind = node_kind;
4762   conflict->kind = svn_wc_conflict_kind_tree;
4763   conflict->access = adm_access;
4764   conflict->operation = operation;
4765   conflict->src_left_version = src_left_version;
4766   conflict->src_right_version = src_right_version;
4767   return conflict;
4871 svn_wc__conflict_description2_dup(const svn_wc_conflict_description2_t *conflict,
4874   return svn_wc_conflict_description2_dup(conflict, pool);