subversion/libsvn_wc/tree_conflicts.c

2  * tree_conflicts.c: Storage of tree conflict descriptions in the WC.
108       || !svn_skel__matches_atom(skel->children, "conflict"))
136                             _("Unknown enumeration value in tree conflict "
145 /* Parse the conflict info fields from SKEL into *VERSION_INFO. */
160                             _("Invalid version info in tree conflict "
199 svn_wc__deserialize_conflict(const svn_wc_conflict_description2_t **conflict,
218                              _("Invalid conflict info '%s' in tree conflict "
229                             _("Empty 'victim' field in tree conflict "
237              _("Invalid 'node_kind' field in tree conflict description"));
275   *conflict = new_conflict;
332                            const svn_wc_conflict_description2_t *conflict,
336   /* A conflict version struct with all fields null/invalid. */
343   if (conflict->src_right_version)
344     SVN_ERR(prepend_version_info_skel(c_skel, conflict->src_right_version,
350   if (conflict->src_left_version)
351     SVN_ERR(prepend_version_info_skel(c_skel, conflict->src_left_version,
357   skel_prepend_enum(c_skel, svn_wc__conflict_reason_map, conflict->reason,
361   skel_prepend_enum(c_skel, svn_wc__conflict_action_map, conflict->action,
365   skel_prepend_enum(c_skel, svn_wc__operation_map, conflict->operation,
369   SVN_ERR_ASSERT(conflict->node_kind == svn_node_dir
370                  || conflict->node_kind == svn_node_file);
371   skel_prepend_enum(c_skel, node_kind_map, conflict->node_kind, result_pool);
374   victim_basename = svn_dirent_basename(conflict->local_abspath, result_pool);
378   svn_skel__prepend(svn_skel__str_atom("conflict", result_pool), c_skel);
404                           const svn_wc_conflict_description2_t *conflict,
411   SVN_ERR_ASSERT(conflict != NULL);
412   SVN_ERR_ASSERT(conflict->operation == svn_wc_operation_merge
413                  || (conflict->reason != svn_wc_conflict_reason_moved_away
414                      && conflict->reason != svn_wc_conflict_reason_moved_here)
417   /* Re-adding an existing tree conflict victim is an error. */
419                                       wc_ctx->db, conflict->local_abspath,
430                              _("Attempt to add tree conflict that already "
432                              svn_dirent_local_style(conflict->local_abspath,
434   else if (!conflict)
440                                                   conflict->local_abspath,
441                                                   conflict->reason,
442                                                   conflict->action,
446   switch(conflict->operation)
451                                                     conflict->src_left_version,
452                                                     conflict->src_right_version,
457                                                     conflict->src_left_version,
458                                                     conflict->src_right_version,
463                                                    conflict->src_left_version,
464                                                    conflict->src_right_version,
470                 svn_wc__db_op_mark_conflict(wc_ctx->db, conflict->local_abspath,