svn commit: r1346399 - /subversion/trunk/subversion/libsvn_wc/workqueue.c

[rhuijben]

Author: rhuijben
Date: Tue Jun  5 14:40:31 2012
New Revision: 1346399

URL: http://svn.apache.org/viewvc?rev=1346399&view=rev
Log:
* subversion/libsvn_wc/workqueue.c
  (run_file_install): Set files to read only when we don't have the lock and
    when the node is not added.

Found by: philip
(via its recent test additions)

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

Modified: subversion/trunk/subversion/libsvn_wc/workqueue.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/workqueue.c?rev=1346399&r1=1346398&r2=1346399&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/workqueue.c (original)
+++ subversion/trunk/subversion/libsvn_wc/workqueue.c Tue Jun  5 14:40:31 2012
@@ -793,15 +793,16 @@ run_file_install(svn_wc__db_t *db,
      that when the lock is locally set (=modification) it is not read only */
   if (props && apr_hash_get(props, SVN_PROP_NEEDS_LOCK, APR_HASH_KEY_STRING))
     {
+      svn_wc__db_status_t status;
       svn_wc__db_lock_t *lock;
-      SVN_ERR(svn_wc__db_read_info(NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+      SVN_ERR(svn_wc__db_read_info(&status, NULL, NULL, NULL, NULL, NULL, NULL,
                                    NULL, NULL, NULL, NULL, NULL, NULL, NULL,
                                    NULL, NULL, &lock, NULL, NULL, NULL, NULL,
                                    NULL, NULL, NULL, NULL, NULL, NULL,
                                    db, local_abspath,
                                    scratch_pool, scratch_pool));
 
-      if (lock)
+      if (!lock && status != svn_wc__db_status_added)
         SVN_ERR(svn_io_set_file_read_only(local_abspath, FALSE, scratch_pool));
     }