1251881Speter/* 2251881Speter * conflicts.h: Conflicts handling 3251881Speter * 4251881Speter * ==================================================================== 5251881Speter * Licensed to the Apache Software Foundation (ASF) under one 6251881Speter * or more contributor license agreements. See the NOTICE file 7251881Speter * distributed with this work for additional information 8251881Speter * regarding copyright ownership. The ASF licenses this file 9251881Speter * to you under the Apache License, Version 2.0 (the 10251881Speter * "License"); you may not use this file except in compliance 11251881Speter * with the License. You may obtain a copy of the License at 12251881Speter * 13251881Speter * http://www.apache.org/licenses/LICENSE-2.0 14251881Speter * 15251881Speter * Unless required by applicable law or agreed to in writing, 16251881Speter * software distributed under the License is distributed on an 17251881Speter * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 18251881Speter * KIND, either express or implied. See the License for the 19251881Speter * specific language governing permissions and limitations 20251881Speter * under the License. 21251881Speter * ==================================================================== 22251881Speter */ 23251881Speter 24251881Speter 25251881Speter 26251881Speter#ifndef SVN_CONFLICTS_H 27251881Speter#define SVN_CONFLICTS_H 28251881Speter 29251881Speter/*** Includes. ***/ 30251881Speter#include <apr_pools.h> 31251881Speter 32251881Speter#include "svn_types.h" 33251881Speter#include "svn_string.h" 34251881Speter#include "svn_wc.h" 35251881Speter 36251881Speter#ifdef __cplusplus 37251881Speterextern "C" { 38251881Speter#endif /* __cplusplus */ 39251881Speter 40251881Speter 41251881Speter 42251881Speter/** 43251881Speter * Return in @a desc a possibly localized human readable 44251881Speter * description of a property conflict described by @a conflict. 45251881Speter * 46251881Speter * Allocate the result in @a pool. 47251881Speter */ 48251881Spetersvn_error_t * 49251881Spetersvn_cl__get_human_readable_prop_conflict_description( 50251881Speter const char **desc, 51251881Speter const svn_wc_conflict_description2_t *conflict, 52251881Speter apr_pool_t *pool); 53251881Speter 54251881Speter/** 55251881Speter * Return in @a desc a possibly localized human readable 56251881Speter * description of a tree conflict described by @a conflict. 57251881Speter * 58251881Speter * Allocate the result in @a pool. 59251881Speter */ 60251881Spetersvn_error_t * 61251881Spetersvn_cl__get_human_readable_tree_conflict_description( 62251881Speter const char **desc, 63251881Speter const svn_wc_conflict_description2_t *conflict, 64251881Speter apr_pool_t *pool); 65251881Speter 66251881Speter/** 67251881Speter * Append to @a str an XML representation of the conflict data 68251881Speter * for @a conflict, in a format suitable for 'svn info --xml'. 69251881Speter */ 70251881Spetersvn_error_t * 71251881Spetersvn_cl__append_conflict_info_xml( 72251881Speter svn_stringbuf_t *str, 73251881Speter const svn_wc_conflict_description2_t *conflict, 74251881Speter apr_pool_t *pool); 75251881Speter 76251881Speter#ifdef __cplusplus 77251881Speter} 78251881Speter#endif /* __cplusplus */ 79251881Speter 80251881Speter#endif /* SVN_CONFLICTS_H */ 81