subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1348881 - in /subversion/branches/1.7.x-r1348822: ./ subversion/libsvn_client/status.c
Date Mon, 11 Jun 2012 14:52:54 GMT
Author: stsp
Date: Mon Jun 11 14:52:53 2012
New Revision: 1348881

URL: http://svn.apache.org/viewvc?rev=1348881&view=rev
Log:
On the 1.7.x-r1348878 branch, merge r1348878, resolving conflicts.

* subversion/libsvn_client/status.c
  (svn_client_status5): Due to unrelated trunk changes, on 1.7.x the depth
   tweak goes in a different spot than on trunk.

Modified:
    subversion/branches/1.7.x-r1348822/   (props changed)
    subversion/branches/1.7.x-r1348822/subversion/libsvn_client/status.c

Propchange: subversion/branches/1.7.x-r1348822/
------------------------------------------------------------------------------
  Merged /subversion/trunk:r1348822

Modified: subversion/branches/1.7.x-r1348822/subversion/libsvn_client/status.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-r1348822/subversion/libsvn_client/status.c?rev=1348881&r1=1348880&r2=1348881&view=diff
==============================================================================
--- subversion/branches/1.7.x-r1348822/subversion/libsvn_client/status.c (original)
+++ subversion/branches/1.7.x-r1348822/subversion/libsvn_client/status.c Mon Jun 11 14:52:53
2012
@@ -299,7 +299,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