You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by da...@apache.org on 2016/03/18 22:10:35 UTC
svn commit: r1735680 -
/subversion/branches/1.9.x/subversion/libsvn_subr/prompt.c
Author: danielsh
Date: Fri Mar 18 21:10:34 2016
New Revision: 1735680
URL: http://svn.apache.org/viewvc?rev=1735680&view=rev
Log:
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/branches/1.9.x/subversion/libsvn_subr/prompt.c
Modified: subversion/branches/1.9.x/subversion/libsvn_subr/prompt.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x/subversion/libsvn_subr/prompt.c?rev=1735680&r1=1735679&r2=1735680&view=diff
==============================================================================
--- subversion/branches/1.9.x/subversion/libsvn_subr/prompt.c (original)
+++ subversion/branches/1.9.x/subversion/libsvn_subr/prompt.c Fri Mar 18 21:10:34 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;
}
else
return err;
Re: svn commit: r1735680 -
/subversion/branches/1.9.x/subversion/libsvn_subr/prompt.c
Posted by Daniel Shahaf <d....@daniel.shahaf.name>.
Daniel Shahaf wrote on Sat, Mar 19, 2016 at 14:48:23 +0000:
> Evgeny Kotkov wrote on Sat, Mar 19, 2016 at 03:03:41 +0300:
> > Daniel Shahaf <da...@apache.org> writes:
> >
> > > 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/branches/1.9.x/subversion/libsvn_subr/prompt.c
> >
> > This was probably meant for trunk?
>
> Indeed. I tried to revert it but failed because LDAP is down. I'll do
> so at the next possible opportunity.
Done.
I also upgraded the 'svn' binary used by svn-role to 1.9.3 from 1.8.9,
since the older version wouldn't have merged the STATUS entry for this
change correctly (see r1735830).
Thanks,
Daniel
Re: svn commit: r1735680 -
/subversion/branches/1.9.x/subversion/libsvn_subr/prompt.c
Posted by Daniel Shahaf <d....@daniel.shahaf.name>.
Evgeny Kotkov wrote on Sat, Mar 19, 2016 at 03:03:41 +0300:
> Daniel Shahaf <da...@apache.org> writes:
>
> > 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/branches/1.9.x/subversion/libsvn_subr/prompt.c
>
> This was probably meant for trunk?
Indeed. I tried to revert it but failed because LDAP is down. I'll do
so at the next possible opportunity.
Thanks,
Daniel
Re: svn commit: r1735680 - /subversion/branches/1.9.x/subversion/libsvn_subr/prompt.c
Posted by Evgeny Kotkov <ev...@visualsvn.com>.
Daniel Shahaf <da...@apache.org> writes:
> 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/branches/1.9.x/subversion/libsvn_subr/prompt.c
This was probably meant for trunk?
Regards,
Evgeny Kotkov