svn commit: r1098556 - /subversion/trunk/subversion/libsvn_wc/wc_db.c

[rhuijben]

Author: rhuijben
Date: Mon May  2 13:22:59 2011
New Revision: 1098556

URL: http://svn.apache.org/viewvc?rev=1098556&view=rev
Log:
* subversion/libsvn_wc/wc_db.c
  (svn_wc__db_read_pristine_info): Following up on r1098208, revert r1098208
    and calculate the status output argument correctly (by checking the
    op_depth).

Modified:
    subversion/trunk/subversion/libsvn_wc/wc_db.c

Modified: subversion/trunk/subversion/libsvn_wc/wc_db.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.c?rev=1098556&r1=1098555&r2=1098556&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Mon May  2 13:22:59 2011
@@ -5991,6 +5991,7 @@ svn_wc__db_read_pristine_info(svn_wc__db
     {
       SVN_ERR(svn_sqlite__step_row(stmt));
 
+      op_depth = svn_sqlite__column_int64(stmt, 0);
       raw_status = svn_sqlite__column_token(stmt, 3, presence_map);
     }
 
@@ -5998,9 +5999,15 @@ svn_wc__db_read_pristine_info(svn_wc__db
 
   if (status)
     {
-      err = svn_error_compose_create(err,
-                                   convert_to_working_status(status,
-                                                             raw_status));
+      if (op_depth > 0)
+        {
+          err = svn_error_compose_create(err,
+                                         convert_to_working_status(
+                                                    status,
+                                                    raw_status));
+        }
+      else
+        *status = raw_status;
     }
   if (kind)
     {