Author: hwright
Date: Thu May 31 14:27:28 2012
New Revision: 1344741

URL: http://svn.apache.org/viewvc?rev=1344741&view=rev
Log:
When running diff, determine the depth capability *before* using it.

* subversion/libsvn_client/diff.c
  (diff_repos_wc): Initialize server_supports_depth before using it.

Modified:
    subversion/trunk/subversion/libsvn_client/diff.c

Modified: subversion/trunk/subversion/libsvn_client/diff.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/diff.c?rev=1344741&r1=1344740&r2=1344741&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/diff.c (original)
+++ subversion/trunk/subversion/libsvn_client/diff.c Thu May 31 14:27:28 2012
@@ -3034,6 +3034,8 @@ diff_repos_wc(const char *path_or_url1,
     }
 
   /* Use the diff editor to generate the diff. */
+  SVN_ERR(svn_ra_has_capability(ra_session, &server_supports_depth,
+                                SVN_RA_CAPABILITY_DEPTH, pool));
   SVN_ERR(svn_wc__get_diff_editor(&diff_editor, &diff_edit_baton,
                                   ctx->wc_ctx,
                                   anchor_abspath,
@@ -3050,8 +3052,6 @@ diff_repos_wc(const char *path_or_url1,
                                   ctx->cancel_func, ctx->cancel_baton,
                                   pool, pool));
   SVN_ERR(svn_ra_reparent(ra_session, anchor_url, pool));
-  SVN_ERR(svn_ra_has_capability(ra_session, &server_supports_depth,
-                                SVN_RA_CAPABILITY_DEPTH, pool));
 
   if (depth != svn_depth_infinity)
     diff_depth = depth;


Reply via email to