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/ (props changed)
subversion/trunk/subversion/libsvn_subr/prompt.c
Propchange: subversion/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Mar 19 22:18:35 2016
@@ -2,6 +2,7 @@
/subversion/branches/1.5.x-r30215:870312
/subversion/branches/1.7.x-fs-verify:1146708,1161180
/subversion/branches/1.9-cache-improvements:1678948-1679863
+/subversion/branches/1.9.x:1735680
/subversion/branches/10Gb:1388102,1388163-1388190,1388195,1388202,1388205,1388211,1388276,1388362,1388375,1388394,1388636,1388639-1388640,1388643-1388644,1388654,1388720,1388789,1388795,1388801,1388805,1388807,1388810,1388816,1389044,1389276,1389289,1389662,1389867,1390017,1390209,1390216,1390407,1390409,1390414,1390419,1390955
/subversion/branches/atomic-revprop:965046-1000689
/subversion/branches/authzperf:1615360
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;
}
else
return err;
