svn commit: r1394130 - /subversion/branches/auto-props-sdc/subversion/libsvn_client/add.c

[pb...@apache.org]

Author: pburba
Date: Thu Oct  4 16:10:56 2012
New Revision: 1394130

URL: http://svn.apache.org/viewvc?rev=1394130&view=rev
Log:
On the auto-props-sdc branch: Force reserved boolean property values to '*'
during 'svn import', just like 'svn add' already does.

* subversion/libsvn_client/add.c

  (all_auto_props_collector): Do like it says above.


Modified:
    subversion/branches/auto-props-sdc/subversion/libsvn_client/add.c

Modified: subversion/branches/auto-props-sdc/subversion/libsvn_client/add.c
URL: http://svn.apache.org/viewvc/subversion/branches/auto-props-sdc/subversion/libsvn_client/add.c?rev=1394130&r1=1394129&r2=1394130&view=diff
==============================================================================
--- subversion/branches/auto-props-sdc/subversion/libsvn_client/add.c (original)
+++ subversion/branches/auto-props-sdc/subversion/libsvn_client/add.c Thu Oct  4 16:10:56 2012
@@ -510,10 +510,22 @@ all_auto_props_collector(const char *nam
 
       if (len > 0)
         {
-          svn_string_t *propval =
-            svn_string_create(this_value, autoprops_baton->result_pool);
           apr_hash_t *pattern_hash = apr_hash_get(autoprops_baton->autoprops,
                                                   name, APR_HASH_KEY_STRING);
+          svn_string_t *propval;
+
+          /* Force reserved boolean property values to '*'. */
+          if (svn_prop_is_boolean(property))
+            {
+              /* SVN_PROP_EXECUTABLE, SVN_PROP_NEEDS_LOCK, SVN_PROP_SPECIAL */
+              propval = svn_string_create("*", autoprops_baton->result_pool);
+            }
+          else
+            {
+              propval = svn_string_create(this_value,
+                                          autoprops_baton->result_pool);
+            }
+
           if (!pattern_hash)
             {
               pattern_hash = apr_hash_make(autoprops_baton->result_pool);