1/* 2 * conflicts.h: Conflicts handling 3 * 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 12 * 13 * http://www.apache.org/licenses/LICENSE-2.0 14 * 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 20 * under the License. 21 * ==================================================================== 22 */ 23 24 25 26#ifndef SVN_CONFLICTS_H 27#define SVN_CONFLICTS_H 28 29/*** Includes. ***/ 30#include <apr_pools.h> 31 32#include "svn_types.h" 33#include "svn_string.h" 34#include "svn_client.h" 35#include "svn_wc.h" 36 37#ifdef __cplusplus 38extern "C" { 39#endif /* __cplusplus */ 40 41 42 43/** 44 * Return in @a desc a possibly localized human readable 45 * description of a property conflict described by @a conflict. 46 * 47 * Allocate the result in @a pool. 48 */ 49svn_error_t * 50svn_cl__get_human_readable_prop_conflict_description( 51 const char **desc, 52 svn_client_conflict_t *conflict, 53 apr_pool_t *pool); 54 55/** 56 * Return in @a desc a possibly localized human readable 57 * description of a tree conflict described by @a conflict. 58 * 59 * Allocate the result in @a pool. 60 */ 61svn_error_t * 62svn_cl__get_human_readable_tree_conflict_description( 63 const char **desc, 64 svn_client_conflict_t *conflict, 65 apr_pool_t *pool); 66 67/* Like svn_cl__get_human_readable_tree_conflict_description but 68 for other conflict types */ 69svn_error_t * 70svn_cl__get_human_readable_action_description( 71 const char **desc, 72 svn_wc_conflict_action_t action, 73 svn_wc_operation_t operation, 74 svn_node_kind_t kind, 75 apr_pool_t *pool); 76 77/** 78 * Append to @a str an XML representation of the conflict data 79 * for @a conflict, in a format suitable for 'svn info --xml'. 80 */ 81svn_error_t * 82svn_cl__append_conflict_info_xml( 83 svn_stringbuf_t *str, 84 svn_client_conflict_t *conflict, 85 apr_pool_t *pool); 86 87#ifdef __cplusplus 88} 89#endif /* __cplusplus */ 90 91#endif /* SVN_CONFLICTS_H */ 92