On 12.02.2015 14:12, rhuij...@apache.org wrote:
> Author: rhuijben
> Date: Thu Feb 12 13:12:40 2015
> New Revision: 1659244
> @@ -506,6 +508,19 @@ print_info(void *baton,
> APR_ARRAY_IDX(info->wc_info->conflicts, 0,
> const svn_wc_conflict_description2_t *);
>
> + if (!printed_tc)
> + {
> + const char *desc;
> +
> + SVN_ERR(svn_cl__get_human_readable_action_description(&desc,
> + svn_wc_conflict_reason_edited,
> + conflict->operation,
> + conflict->node_kind, pool));
subversion/svn/info-cmd.c:516:41: warning: implicit conversion from enumeration
type
'enum svn_wc_conflict_reason_t' to different enumeration type
'svn_wc_conflict_action_t' (aka 'enum svn_wc_conflict_action_t')
[-Wenum-conversion]
svn_wc_conflict_reason_edited,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/Users/brane/src/svn/repos/cxxhl/subversion/include/svn_error.h:340:35: note:
expanded from macro 'SVN_ERR'
svn_error_t *svn_err__temp = (expr); \
^
1 warning generated.
