| 1 | /* |
|---|
| 2 | * tree-conflicts.h: Tree conflicts. |
|---|
| 3 | * |
|---|
| 4 | * ==================================================================== |
|---|
| 5 | * Copyright (c) 2007-2008 CollabNet. All rights reserved. |
|---|
| 6 | * |
|---|
| 7 | * This software is licensed as described in the file COPYING, which |
|---|
| 8 | * you should have received as part of this distribution. The terms |
|---|
| 9 | * are also available at http://subversion.tigris.org/license-1.html. |
|---|
| 10 | * If newer versions of this license are posted there, you may use a |
|---|
| 11 | * newer version instead, at your option. |
|---|
| 12 | * |
|---|
| 13 | * This software consists of voluntary contributions made by many |
|---|
| 14 | * individuals. For exact contribution history, see the revision |
|---|
| 15 | * history and logs, available at http://subversion.tigris.org/. |
|---|
| 16 | * ==================================================================== |
|---|
| 17 | */ |
|---|
| 18 | |
|---|
| 19 | |
|---|
| 20 | |
|---|
| 21 | #ifndef SVN_TREE_CONFLICTS_H |
|---|
| 22 | #define SVN_TREE_CONFLICTS_H |
|---|
| 23 | |
|---|
| 24 | /*** Includes. ***/ |
|---|
| 25 | #include <apr_pools.h> |
|---|
| 26 | |
|---|
| 27 | #include "svn_types.h" |
|---|
| 28 | #include "svn_string.h" |
|---|
| 29 | #include "svn_wc.h" |
|---|
| 30 | |
|---|
| 31 | #ifdef __cplusplus |
|---|
| 32 | extern "C" { |
|---|
| 33 | #endif /* __cplusplus */ |
|---|
| 34 | |
|---|
| 35 | |
|---|
| 36 | |
|---|
| 37 | /** |
|---|
| 38 | * Return in @a desc a possibly localized human readable |
|---|
| 39 | * description of a tree conflict described by @a conflict. |
|---|
| 40 | * |
|---|
| 41 | * Allocate the result in @a pool. |
|---|
| 42 | * |
|---|
| 43 | * @since New in 1.6. |
|---|
| 44 | */ |
|---|
| 45 | svn_error_t * |
|---|
| 46 | svn_cl__get_human_readable_tree_conflict_description( |
|---|
| 47 | const char **desc, |
|---|
| 48 | const svn_wc_conflict_description_t *conflict, |
|---|
| 49 | apr_pool_t *pool); |
|---|
| 50 | |
|---|
| 51 | /** |
|---|
| 52 | * Append to @a str an XML representation of the tree conflict data |
|---|
| 53 | * for @a conflict, in a format suitable for 'svn info --xml'. |
|---|
| 54 | * |
|---|
| 55 | * @since New in 1.6. |
|---|
| 56 | */ |
|---|
| 57 | svn_error_t * |
|---|
| 58 | svn_cl__append_tree_conflict_info_xml( |
|---|
| 59 | svn_stringbuf_t *str, |
|---|
| 60 | const svn_wc_conflict_description_t *conflict, |
|---|
| 61 | apr_pool_t *pool); |
|---|
| 62 | |
|---|
| 63 | #ifdef __cplusplus |
|---|
| 64 | } |
|---|
| 65 | #endif /* __cplusplus */ |
|---|
| 66 | |
|---|
| 67 | #endif /* SVN_TREE_CONFLICTS_H */ |
|---|
