2 * resolved-cmd.c -- Subversion resolved subcommand
4 * ====================================================================
5 * Licensed to the Apache Software Foundation (ASF) under one
6 * or more contributor license agreements. See the NOTICE file
7 * distributed with this work for additional information
8 * regarding copyright ownership. The ASF licenses this file
9 * to you under the Apache License, Version 2.0 (the
10 * "License"); you may not use this file except in compliance
11 * with the License. You may obtain a copy of the License at
13 * http://www.apache.org/licenses/LICENSE-2.0
15 * Unless required by applicable law or agreed to in writing,
16 * software distributed under the License is distributed on an
17 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
18 * KIND, either express or implied. See the License for the
19 * specific language governing permissions and limitations
21 * ====================================================================
24 /* ==================================================================== */
30 #include "svn_client.h"
31 #include "svn_error.h"
32 #include "svn_pools.h"
35 #include "svn_private_config.h"
41 /* This implements the `svn_opt_subcommand_t' interface. */
43 svn_cl__resolved(apr_getopt_t *os,
45 apr_pool_t *scratch_pool)
47 svn_cl__opt_state_t *opt_state = ((svn_cl__cmd_baton_t *) baton)->opt_state;
48 svn_client_ctx_t *ctx = ((svn_cl__cmd_baton_t *) baton)->ctx;
50 apr_array_header_t *targets;
54 SVN_ERR(svn_cl__args_to_target_array_print_reserved(&targets, os,
59 return svn_error_create(SVN_ERR_CL_INSUFFICIENT_ARGS, 0, NULL);
61 if (opt_state->depth == svn_depth_unknown)
62 opt_state->depth = svn_depth_empty;
64 SVN_ERR(svn_cl__eat_peg_revisions(&targets, targets, scratch_pool));
66 SVN_ERR(svn_cl__check_targets_are_local_paths(targets));
68 iterpool = svn_pool_create(scratch_pool);
69 for (i = 0; i < targets->nelts; i++)
71 const char *target = APR_ARRAY_IDX(targets, i, const char *);
72 svn_pool_clear(iterpool);
73 SVN_ERR(svn_cl__check_cancel(ctx->cancel_baton));
74 err = svn_client_resolve(target,
76 svn_wc_conflict_choose_merged,
81 svn_handle_warning2(stderr, err, "svn: ");
85 svn_pool_destroy(iterpool);