subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1348822 - /subversion/trunk/subversion/libsvn_client/status.c
Date Mon, 11 Jun 2012 12:34:01 GMT
Author: stsp
Date: Mon Jun 11 12:34:00 2012
New Revision: 1348822

URL: http://svn.apache.org/viewvc?rev=1348822&view=rev
Log:
Fix "svn status --update --depth=empty FILE", which was not showing the
status of FILE.

* subversion/libsvn_client/status.c
  (svn_client_status5): If the status -u target is a file, the status editor
   is rooted at the file's parent. Upgrade depth from 'empty' to 'files' in
   this case, to ensure that the target itself escapes depth filtering.

Found by: Dmitry Pavlenko <pavlenko@tmatesoft.com>

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

Modified: subversion/trunk/subversion/libsvn_client/status.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/status.c?rev=1348822&r1=1348821&r2=1348822&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/status.c (original)
+++ subversion/trunk/subversion/libsvn_client/status.c Mon Jun 11 12:34:00 2012
@@ -316,7 +316,12 @@ svn_client_status5(svn_revnum_t *result_
          target_basename = svn_dirent_basename(target_abspath, NULL);
          dir = svn_dirent_dirname(path, pool);
 
-         if (kind != svn_node_file)
+         if (kind == svn_node_file)
+           {
+             if (depth == svn_depth_empty)
+               depth = svn_depth_files;
+           }
+         else
            {
              err = svn_wc_read_kind(&kind, ctx->wc_ctx, dir_abspath, FALSE,
                                     pool);



Mime
View raw message