On Wed, Nov 09, 2016 at 11:21:42PM +0100, Stefan wrote:
> Hi,
>
> attached is a patch to correct indentation in
> svn_client_conflict_text_resolve_by_id() which was spotted by Evgeny
> (related to the mail thread: "svn commit: r1764902 - in
> /subversion/trunk/subversion: libsvn_client/conflicts.c
> svn/conflict-callbacks.c tests/cmdline/resolve_tests.py").
>
> Regards,
> Stefan
>
> [[[
> Following up on r1764902: Corrected indentation.
>
> * subversion/libsvn_client/conflicts.c
> (svn_client_conflict_text_resolve_by_id): As above.
>
> Found by: katkov
Evgeny's account name is "kotkov".
> ]]]
>
+1, please commit this.
> Index: subversion/libsvn_client/conflicts.c
> ===================================================================
> --- subversion/libsvn_client/conflicts.c (revision 1768609)
> +++ subversion/libsvn_client/conflicts.c (working copy)
> @@ -8952,12 +8952,12 @@
> }
>
> if (option == NULL)
> - return svn_error_createf(SVN_ERR_CLIENT_CONFLICT_OPTION_NOT_APPLICABLE,
> - NULL,
> - _("Inapplicable conflict resolution option "
> - "given for conflicted path '%s'"),
> -
> svn_dirent_local_style(conflict->local_abspath,
> - scratch_pool));
> + return svn_error_createf(SVN_ERR_CLIENT_CONFLICT_OPTION_NOT_APPLICABLE,
> + NULL,
> + _("Inapplicable conflict resolution option "
> + "given for conflicted path '%s'"),
> + svn_dirent_local_style(conflict->local_abspath,
> + scratch_pool));
>
> SVN_ERR(svn_client_conflict_text_resolve(conflict, option, ctx,
> scratch_pool));
>
