You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ph...@apache.org on 2011/04/01 17:45:25 UTC
svn commit: r1087777 - /subversion/trunk/subversion/libsvn_wc/adm_ops.c
Author: philip
Date: Fri Apr 1 15:45:24 2011
New Revision: 1087777
URL: http://svn.apache.org/viewvc?rev=1087777&view=rev
Log:
* subversion/libsvn_wc/adm_ops.c
(revert_restore): Property values are strings not booleans.
Modified:
subversion/trunk/subversion/libsvn_wc/adm_ops.c
Modified: subversion/trunk/subversion/libsvn_wc/adm_ops.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/adm_ops.c?rev=1087777&r1=1087776&r2=1087777&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/adm_ops.c (original)
+++ subversion/trunk/subversion/libsvn_wc/adm_ops.c Fri Apr 1 15:45:24 2011
@@ -1444,23 +1444,23 @@ revert_restore(svn_wc__db_t *db,
else
{
apr_hash_t *props;
- svn_boolean_t read_only_prop;
+ svn_string_t *needs_lock_prop;
#if !defined(WIN32) && !defined(__OS2__)
- svn_boolean_t executable_prop;
+ svn_string_t *executable_prop;
#endif
SVN_ERR(svn_wc__db_read_pristine_props(&props, db, local_abspath,
scratch_pool,
scratch_pool));
- read_only_prop = apr_hash_get(props, SVN_PROP_NEEDS_LOCK,
- APR_HASH_KEY_STRING);
- if (read_only_prop && !read_only)
+ needs_lock_prop = apr_hash_get(props, SVN_PROP_NEEDS_LOCK,
+ APR_HASH_KEY_STRING);
+ if (needs_lock_prop && !read_only)
{
SVN_ERR(svn_io_set_file_read_only(local_abspath,
FALSE, scratch_pool));
notify_required = TRUE;
}
- else if (!read_only_prop && read_only)
+ else if (!needs_lock_prop && read_only)
{
SVN_ERR(svn_io_set_file_read_write(local_abspath,
FALSE, scratch_pool));
@@ -1500,6 +1500,7 @@ revert_restore(svn_wc__db_t *db,
{
svn_skel_t *work_item;
+ /* ### Get the checksum from read_info above and pass in here? */
SVN_ERR(svn_wc__wq_build_file_install(&work_item, db, local_abspath,
NULL, use_commit_times, TRUE,
scratch_pool, scratch_pool));