svn commit: r1190463 - in /subversion/trunk/subversion/libsvn_client: status.c update.c

[ph...@apache.org]

Author: philip
Date: Fri Oct 28 17:26:00 2011
New Revision: 1190463

URL: http://svn.apache.org/viewvc?rev=1190463&view=rev
Log:
Fix issue 4046, "svn update --depth=empty" against a server that is
not depth aware.  This is sufficient to allow depth_tests.py to PASS
when run against a 1.4 mod_dav_svn.

* subversion/libsvn_client/status.c
  (svn_client_status5): Take account of whether server supports depth.

* subversion/libsvn_client/update.c
  (update_internal): Take account of whether server supports depth.

Modified:
    subversion/trunk/subversion/libsvn_client/status.c
    subversion/trunk/subversion/libsvn_client/update.c

Modified: subversion/trunk/subversion/libsvn_client/status.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/status.c?rev=1190463&r1=1190462&r2=1190463&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/status.c (original)
+++ subversion/trunk/subversion/libsvn_client/status.c Fri Oct 28 17:26:00 2011
@@ -430,7 +430,7 @@ svn_client_status5(svn_revnum_t *result_
                                                       pool));
             }
 
-          if (depth_as_sticky)
+          if (depth_as_sticky || !server_supports_depth)
             status_depth = depth;
           else
             status_depth = svn_depth_unknown; /* Use depth from WC */

Modified: subversion/trunk/subversion/libsvn_client/update.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/update.c?rev=1190463&r1=1190462&r2=1190463&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/update.c (original)
+++ subversion/trunk/subversion/libsvn_client/update.c Fri Oct 28 17:26:00 2011
@@ -389,7 +389,9 @@ update_internal(svn_revnum_t *result_rev
      invalid revnum, that means RA will use the latest revision.  */
   SVN_ERR(svn_ra_do_update2(ra_session, &reporter, &report_baton,
                             revnum, target,
-                            depth_is_sticky ? depth : svn_depth_unknown,
+                            (!server_supports_depth || depth_is_sticky
+                             ? depth
+                             : svn_depth_unknown),
                             FALSE, update_editor, update_edit_baton, pool));
 
   /* Drive the reporter structure, describing the revisions within