[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: svn commit: r1735826 - in /subversion/trunk: ./ subversion/libsvn_subr/prompt.c

From: Ivan Zhakov <ivan_at_visualsvn.com>
Date: Mon, 28 Mar 2016 16:13:11 +0300

On 20 March 2016 at 01:18, <danielsh_at_apache.org> wrote:
> Author: danielsh
> Date: Sat Mar 19 22:18:35 2016
> New Revision: 1735826
>
> URL: http://svn.apache.org/viewvc?rev=1735826&view=rev
> Log:
> Merge r1735680 to trunk, which was accidentally committed to a different branch.
>
> That revision's log message is:
>
> ------------------------------------------------------------------------
> r1735680 | danielsh | 2016-03-18 21:10:34 +0000 (Fri, 18 Mar 2016) | 9 lines
>
> Make SIGINT abort a commit, even at the interactive plaintext prompt.
> (Issue #4624.)
>
> Follow-up to r30730 (r870804).
>
> Found by: Richlv
>
> * subversion/libsvn_subr/prompt.c
> (plaintext_prompt_helper): Propagate canncellations.
> ------------------------------------------------------------------------
>
[...]

> Modified: subversion/trunk/subversion/libsvn_subr/prompt.c
> URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/prompt.c?rev=1735826&r1=1735825&r2=1735826&view=diff
> ==============================================================================
> --- subversion/trunk/subversion/libsvn_subr/prompt.c (original)
> +++ subversion/trunk/subversion/libsvn_subr/prompt.c Sat Mar 19 22:18:35 2016
> @@ -831,9 +831,8 @@ plaintext_prompt_helper(svn_boolean_t *m
> {
> if (err->apr_err == SVN_ERR_CANCELLED)
> {
> - svn_error_clear(err);
> *may_save_plaintext = FALSE;
> - return SVN_NO_ERROR;
> + return err;
Daniel, do you know what was the original idea behind ignoring the
SVN_ERR_CANCELLED error? I see stsp committed the original code in
r870804, so there's probably some rationale behind it.

Stefan, do you remember any details?

-- 
Ivan Zhakov
Received on 2016-03-28 15:13:38 CEST

This is an archived mail posted to the Subversion Dev mailing list.