subversion/libsvn_wc/conflicts.c

541                                         svn_wc_conflict_action_t action,
589   svn_skel__prepend_str(svn_token__to_word(action_map, action),
950                                     svn_wc_conflict_action_t *action,
990   if (action)
995         *action = value;
997         *action = svn_wc_conflict_action_edit;
1331     cdesc->action = svn_wc_conflict_action_add;
1333     cdesc->action = svn_wc_conflict_action_delete;
1335     cdesc->action = svn_wc_conflict_action_edit;
1836   svn_wc_conflict_action_t action;
1839             &reason, &action, NULL, NULL,
1847   else if (action == svn_wc_conflict_action_delete
1865   (*desc)->action = action;
2199       /* Compute the incoming side of the conflict ('action'). */
2201         desc->action = svn_wc_conflict_action_delete;
2203         desc->action = svn_wc_conflict_action_add;
2205         desc->action = svn_wc_conflict_action_edit;
2700   svn_wc_conflict_action_t action;
2713   SVN_ERR(svn_wc__conflict_read_tree_conflict(&reason, &action,
2731               if (action != svn_wc_conflict_action_delete)
2785               SVN_ERR(svn_wc__conflict_read_tree_conflict(&reason, &action,
2813            && action == svn_wc_conflict_action_edit)
2823                         operation, action, reason,
2857                && action != svn_wc_conflict_action_edit)
2859           /* action added is impossible, because that would imply that
2862           SVN_ERR_ASSERT(action == svn_wc_conflict_action_delete
2863                          || action == svn_wc_conflict_action_replace);
3002       && (notify->action == svn_wc_notify_tree_conflict
3502   svn_wc_conflict_action_t action;
3522   SVN_ERR(svn_wc__conflict_read_tree_conflict(&reason, &action,
3547   if (action != svn_wc_conflict_action_delete)
3590   svn_wc_conflict_action_t action;
3609   SVN_ERR(svn_wc__conflict_read_tree_conflict(&reason, &action, NULL, NULL,
3629   if (action != svn_wc_conflict_action_edit)
3631                              _("Unexpected conflict action '%s' on '%s'"),
3632                              svn_token__to_word(action_map, action),
3667   svn_wc_conflict_action_t action;
3687   SVN_ERR(svn_wc__conflict_read_tree_conflict(&reason, &action,
3707   if (action != svn_wc_conflict_action_edit)
3709                              _("Unexpected conflict action '%s' on '%s'"),
3710                              svn_token__to_word(action_map, action),
3719                                                        action,
3795                              _("Unexpected conflict action '%s' on '%s'"),
3862                              _("Unexpected conflict action '%s' on '%s'"),