svn commit: r1185918 - in /subversion/trunk/subversion: libsvn_wc/adm_crawler.c tests/cmdline/depth_tests.py

[rh...@apache.org]

Author: rhuijben
Date: Tue Oct 18 23:25:16 2011
New Revision: 1185918

URL: http://svn.apache.org/viewvc?rev=1185918&view=rev
Log:
Resolve a regression which sometimes didn't reporting depth empty directories
to a server, which made update receive changes on nodes that don't exist
locally.

The working copy doesn't break, but it is certainly inconvenient that update
sometimes fails when it shouldn't.

* subversion/libsvn_wc/adm_crawler.c
  (report_revisions_and_depths): Report changed depths when walking recursive,
    instead of just with an explicit depth infinity walk.

* subversion/tests/cmdline/depth_tests.py
  (update_below_depth_empty): Remove XFail marker.

Modified:
    subversion/trunk/subversion/libsvn_wc/adm_crawler.c
    subversion/trunk/subversion/tests/cmdline/depth_tests.py

Modified: subversion/trunk/subversion/libsvn_wc/adm_crawler.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/adm_crawler.c?rev=1185918&r1=1185917&r2=1185918&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/adm_crawler.c (original)
+++ subversion/trunk/subversion/libsvn_wc/adm_crawler.c Tue Oct 18 23:25:16 2011
@@ -562,7 +562,7 @@ report_revisions_and_depths(svn_wc__db_t
                    || (dir_depth == svn_depth_immediates
                        && ths->depth != svn_depth_empty)
                    || (ths->depth < svn_depth_infinity
-                       && depth == svn_depth_infinity))
+                       && SVN_DEPTH_IS_RECURSIVE(depth)))
             {
               /* ... or perhaps just a differing revision, lock token,
                  incomplete subdir, the mere presence of the directory

Modified: subversion/trunk/subversion/tests/cmdline/depth_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/depth_tests.py?rev=1185918&r1=1185917&r2=1185918&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/depth_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/depth_tests.py Tue Oct 18 23:25:16 2011
@@ -2811,7 +2811,6 @@ def sparse_update_with_dash_dash_parents
                                         None, None, None, None, None, False,
                                         '--parents', omega_path)
 
-@XFail()
 def update_below_depth_empty(sbox):
   "update below depth empty shouldn't be applied"
   sbox.build()