subversion/libsvn_wc/tree_conflicts.c

2  * tree_conflicts.c: Storage of tree conflict descriptions in the WC.
109       || !svn_skel__matches_atom(skel->children, "conflict"))
137                             _("Unknown enumeration value in tree conflict "
146 /* Parse the conflict info fields from SKEL into *VERSION_INFO. */
161                             _("Invalid version info in tree conflict "
200 svn_wc__deserialize_conflict(const svn_wc_conflict_description2_t **conflict,
219                              _("Invalid conflict info '%s' in tree conflict "
230                             _("Empty 'victim' field in tree conflict "
238              _("Invalid 'node_kind' field in tree conflict description"));
276   *conflict = new_conflict;
333                            const svn_wc_conflict_description2_t *conflict,
337   /* A conflict version struct with all fields null/invalid. */
344   if (conflict->src_right_version)
345     SVN_ERR(prepend_version_info_skel(c_skel, conflict->src_right_version,
351   if (conflict->src_left_version)
352     SVN_ERR(prepend_version_info_skel(c_skel, conflict->src_left_version,
359                     conflict->reason, result_pool);
363                     conflict->action, result_pool);
366   skel_prepend_enum(c_skel, svn_wc__operation_map, conflict->operation,
370   SVN_ERR_ASSERT(conflict->node_kind == svn_node_dir
371                  || conflict->node_kind == svn_node_file
372                  || conflict->node_kind == svn_node_none);
373   skel_prepend_enum(c_skel, node_kind_map, conflict->node_kind,
377   victim_basename = svn_dirent_basename(conflict->local_abspath, result_pool);
381   svn_skel__prepend(svn_skel__str_atom("conflict", result_pool), c_skel);
407                           const svn_wc_conflict_description2_t *conflict,
414   SVN_ERR_ASSERT(conflict != NULL);
415   SVN_ERR_ASSERT(conflict->operation == svn_wc_operation_merge ||
416                  (conflict->reason != svn_wc_conflict_reason_moved_away &&
417                   conflict->reason != svn_wc_conflict_reason_moved_here));
419   /* Re-adding an existing tree conflict victim is an error. */
421                                       wc_ctx->db, conflict->local_abspath,
432                              _("Attempt to add tree conflict that already "
434                              svn_dirent_local_style(conflict->local_abspath,
436   else if (!conflict)
442                                                   conflict->local_abspath,
443                                                   conflict->reason,
444                                                   conflict->action,
448   switch (conflict->operation)
453                                                     conflict->src_left_version,
454                                                     conflict->src_right_version,
459                                                     conflict->src_left_version,
460                                                     conflict->src_right_version,
465                                                    conflict->src_left_version,
466                                                    conflict->src_right_version,
472                 svn_wc__db_op_mark_conflict(wc_ctx->db, conflict->local_abspath,