subversion/libsvn_wc/util.c

196   svn_wc_conflict_description2_t *conflict;
200   conflict = apr_pcalloc(result_pool, sizeof(*conflict));
201   conflict->local_abspath = apr_pstrdup(result_pool, local_abspath);
202   conflict->node_kind = svn_node_file;
203   conflict->kind = svn_wc_conflict_kind_text;
204   conflict->action = svn_wc_conflict_action_edit;
205   conflict->reason = svn_wc_conflict_reason_edited;
206   return conflict;
215   svn_wc_conflict_description2_t *conflict;
219   conflict = apr_pcalloc(result_pool, sizeof(*conflict));
220   conflict->local_abspath = apr_pstrdup(result_pool, local_abspath);
221   conflict->node_kind = node_kind;
222   conflict->kind = svn_wc_conflict_kind_property;
223   conflict->property_name = apr_pstrdup(result_pool, property_name);
224   return conflict;
236   svn_wc_conflict_description2_t *conflict;
240   conflict = apr_pcalloc(result_pool, sizeof(*conflict));
241   conflict->local_abspath = apr_pstrdup(result_pool, local_abspath);
242   conflict->node_kind = node_kind;
243   conflict->kind = svn_wc_conflict_kind_tree;
244   conflict->operation = operation;
245   conflict->src_left_version = svn_wc_conflict_version_dup(src_left_version,
247   conflict->src_right_version = svn_wc_conflict_version_dup(src_right_version,
249   return conflict;
279 svn_wc_conflict_description2_dup(const svn_wc_conflict_description2_t *conflict,
287   *new_conflict = *conflict;
289   if (conflict->local_abspath)
290     new_conflict->local_abspath = apr_pstrdup(pool, conflict->local_abspath);
291   if (conflict->property_name)
292     new_conflict->property_name = apr_pstrdup(pool, conflict->property_name);
293   if (conflict->mime_type)
294     new_conflict->mime_type = apr_pstrdup(pool, conflict->mime_type);
295   if (conflict->base_abspath)
296     new_conflict->base_abspath = apr_pstrdup(pool, conflict->base_abspath);
297   if (conflict->their_abspath)
298     new_conflict->their_abspath = apr_pstrdup(pool, conflict->their_abspath);
299   if (conflict->my_abspath)
300     new_conflict->my_abspath = apr_pstrdup(pool, conflict->my_abspath);
301   if (conflict->merged_file)
302     new_conflict->merged_file = apr_pstrdup(pool, conflict->merged_file);
303   if (conflict->src_left_version)
305       svn_wc_conflict_version_dup(conflict->src_left_version, pool);
306   if (conflict->src_right_version)
308       svn_wc_conflict_version_dup(conflict->src_right_version, pool);
312   if (conflict->prop_reject_abspath)
315   if (conflict->prop_value_base)
317       svn_string_dup(conflict->prop_value_base, pool);
318   if (conflict->prop_value_working)
320       svn_string_dup(conflict->prop_value_working, pool);
321   if (conflict->prop_value_incoming_old)
323       svn_string_dup(conflict->prop_value_incoming_old, pool);
324   if (conflict->prop_value_incoming_new)
326       svn_string_dup(conflict->prop_value_incoming_new, pool);
360 svn_wc__cd2_to_cd(const svn_wc_conflict_description2_t *conflict,
365   if (conflict == NULL)
370   new_conflict->path = apr_pstrdup(result_pool, conflict->local_abspath);
371   new_conflict->node_kind = conflict->node_kind;
372   new_conflict->kind = conflict->kind;
373   new_conflict->action = conflict->action;
374   new_conflict->reason = conflict->reason;
375   if (conflict->src_left_version)
377           svn_wc_conflict_version_dup(conflict->src_left_version, result_pool);
378   if (conflict->src_right_version)
380           svn_wc_conflict_version_dup(conflict->src_right_version, result_pool);
382   switch (conflict->kind)
387                                                   conflict->property_name);
391         new_conflict->is_binary = conflict->is_binary;
392         if (conflict->mime_type)
394                                                 conflict->mime_type);
395         if (conflict->base_abspath)
397                                                 conflict->base_abspath);
398         if (conflict->their_abspath)
400                                                  conflict->their_abspath);
401         if (conflict->my_abspath)
403                                               conflict->my_abspath);
404         if (conflict->merged_file)
406                                                   conflict->merged_file);
410         new_conflict->operation = conflict->operation;