You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by hw...@apache.org on 2010/03/16 02:43:06 UTC
svn commit: r923540 - in /subversion/branches/1.6.x: ./ CHANGES STATUS
subversion/libsvn_ra_svn/client.c
Author: hwright
Date: Tue Mar 16 01:43:05 2010
New Revision: 923540
URL: http://svn.apache.org/viewvc?rev=923540&view=rev
Log:
Merge r922516 from trunk:
* r922516
Tell svn+ssh:// users how to get error messages from ssh when there
is a connection problem.
Justification:
Not everyone realises that svn passes the -q option to ssh by default.
Votes:
+1: stsp, rhuijben, cmpilato
Modified:
subversion/branches/1.6.x/ (props changed)
subversion/branches/1.6.x/CHANGES (props changed)
subversion/branches/1.6.x/STATUS
subversion/branches/1.6.x/subversion/libsvn_ra_svn/client.c
Propchange: subversion/branches/1.6.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 16 01:43:05 2010
@@ -56,4 +56,4 @@
/subversion/branches/tc_url_rev:870696-870828
/subversion/branches/tree-conflicts:864636-869499
/subversion/branches/tree-conflicts-notify:870271-870353
-/subversion/trunk:875976,875980-875981,876054-876056,876092,876175,876299,876306,876427,876440,876450,876507,876571,879093,879688,880274-880275,880370,880450,880474,880525-880526,880552,881905,884842,886164,886197,888715,888979,889081,889840,895514,895653,896522,898963,899826,899828,900797,904594,905326
+/subversion/trunk:875976,875980-875981,876054-876056,876092,876175,876299,876306,876427,876440,876450,876507,876571,879093,879688,880274-880275,880370,880450,880474,880525-880526,880552,881905,884842,886164,886197,888715,888979,889081,889840,895514,895653,896522,898963,899826,899828,900797,904594,905326,922516
Propchange: subversion/branches/1.6.x/CHANGES
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 16 01:43:05 2010
@@ -55,4 +55,4 @@
/subversion/branches/tc_url_rev/CHANGES:870696-870828
/subversion/branches/tree-conflicts/CHANGES:864636-869499
/subversion/branches/tree-conflicts-notify/CHANGES:870271-870353
-/subversion/trunk/CHANGES:875962-901365,904594,905326
+/subversion/trunk/CHANGES:875962-901365,904594,905326,922516
Modified: subversion/branches/1.6.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x/STATUS?rev=923540&r1=923539&r2=923540&view=diff
==============================================================================
--- subversion/branches/1.6.x/STATUS (original)
+++ subversion/branches/1.6.x/STATUS Tue Mar 16 01:43:05 2010
@@ -304,12 +304,3 @@ Approved changes:
hwright sez: Danger! Danger! This has merge conflicts.
Votes:
+1: pburba, rhuijben, cmpilato
-
- * r922516
- Tell svn+ssh:// users how to get error messages from ssh when there
- is a connection problem.
- Justification:
- Not everyone realises that svn passes the -q option to ssh by default.
- Votes:
- +1: stsp, rhuijben, cmpilato
-
Modified: subversion/branches/1.6.x/subversion/libsvn_ra_svn/client.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x/subversion/libsvn_ra_svn/client.c?rev=923540&r1=923539&r2=923540&view=diff
==============================================================================
--- subversion/branches/1.6.x/subversion/libsvn_ra_svn/client.c (original)
+++ subversion/branches/1.6.x/subversion/libsvn_ra_svn/client.c Tue Mar 16 01:43:05 2010
@@ -457,6 +457,7 @@ static svn_error_t *make_tunnel(const ch
apr_status_t status;
apr_proc_t *proc;
apr_procattr_t *attr;
+ svn_error_t *err;
status = apr_procattr_create(&attr, pool);
if (status == APR_SUCCESS)
@@ -510,7 +511,14 @@ static svn_error_t *make_tunnel(const ch
/* Guard against dotfile output to stdout on the server. */
*conn = svn_ra_svn_create_conn(NULL, proc->out, proc->in, pool);
- SVN_ERR(svn_ra_svn_skip_leading_garbage(*conn, pool));
+ err = svn_ra_svn_skip_leading_garbage(*conn, pool);
+ if (err)
+ return svn_error_quick_wrap(
+ err,
+ _("To better debug SSH connection problems, remove the -q "
+ "option from 'ssh' in the [tunnels] section of your "
+ "Subversion configuration file."));
+
return SVN_NO_ERROR;
}