On 30.07.2015 20:50, [email protected] wrote:
> Author: stsp
> Date: Thu Jul 30 18:50:50 2015
> New Revision: 1693472
>
> URL: http://svn.apache.org/r1693472
> Log:
> * subversion/libsvn_client/resolved.c
> (resolve_conflict): Use local variable 'err' as intended.
>
> Modified:
> subversion/trunk/subversion/libsvn_client/resolved.c
.../subversion/libsvn_client/resolved.c:306:35: warning: implicit conversion
from enumeration type
'svn_client_conflict_option_id_t' (aka 'enum
svn_client_conflict_option_id_t') to different enumeration type
'svn_wc_conflict_choice_t' (aka 'enum svn_wc_conflict_choice_t')
[-Wenum-conversion]
option_id, /* id is backwards compatible */
^~~~~~~~~
