subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From julianf...@apache.org
Subject svn commit: r1092733 - in /subversion/trunk/subversion: libsvn_wc/wc_db.c tests/cmdline/stat_tests.py
Date Fri, 15 Apr 2011 15:07:11 GMT
Author: julianfoad
Date: Fri Apr 15 15:07:11 2011
New Revision: 1092733

URL: http://svn.apache.org/viewvc?rev=1092733&view=rev
Log:
Fix issue #3855 "status doesn't show 'K' on a locked deleted node".

* subversion/libsvn_wc/wc_db.c
  (read_children_info): The query yields repository lock info for a given path
    in the op-depth 0 row only, so read it from that row instead of from the
    highest op-depth row.

* subversion/tests/cmdline/stat_tests.py
  (status_locked_deleted): Remove 'XFail' because this test now passes.

Modified:
    subversion/trunk/subversion/libsvn_wc/wc_db.c
    subversion/trunk/subversion/tests/cmdline/stat_tests.py

Modified: subversion/trunk/subversion/libsvn_wc/wc_db.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.c?rev=1092733&r1=1092732&r2=1092733&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Fri Apr 15 15:07:11 2011
@@ -5537,8 +5537,6 @@ read_children_info(void *baton,
 
           child->translated_size = get_translated_size(stmt, 7);
 
-          child->lock = lock_from_columns(stmt, 15, 16, 17, 18, result_pool);
-
           err = svn_sqlite__column_properties(&properties, stmt, 14,
                                               scratch_pool, scratch_pool);
           if (err)
@@ -5563,6 +5561,11 @@ read_children_info(void *baton,
           child->have_base = TRUE;
         }
 
+      /* Get the lock info. The query only reports lock info in the row at
+       * op_depth 0. */
+      if (row_op_depth == 0)
+        child->lock = lock_from_columns(stmt, 15, 16, 17, 18, result_pool);
+
       err = svn_sqlite__step(&have_row, stmt);
       if (err)
         SVN_ERR(svn_error_compose_create(err, svn_sqlite__reset(stmt)));

Modified: subversion/trunk/subversion/tests/cmdline/stat_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/stat_tests.py?rev=1092733&r1=1092732&r2=1092733&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/stat_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/stat_tests.py Fri Apr 15 15:07:11 2011
@@ -1828,7 +1828,6 @@ def simple_lock(sbox, relpath):
 # Regression test for issue #3855 "status doesn't show 'K' on a locked
 # deleted node".
 @Issue(3855)
-@XFail()
 def status_locked_deleted(sbox):
   "status with locked deleted file"
 



Mime
View raw message