subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From svn-r...@apache.org
Subject svn commit: r1496728 - in /subversion/branches/1.8.x: ./ STATUS subversion/libsvn_repos/fs-wrap.c
Date Wed, 26 Jun 2013 04:00:53 GMT
Author: svn-role
Date: Wed Jun 26 04:00:53 2013
New Revision: 1496728

URL: http://svn.apache.org/r1496728
Log:
Merge the r1495432 group from trunk:

 * r1495432, r1495446
   Allow deleting non-regular properties from nodes.
   Justification:
     No way to remove them from historical files that have them.
   Votes:
     +1: stsp, danielsh, stefan2

Modified:
    subversion/branches/1.8.x/   (props changed)
    subversion/branches/1.8.x/STATUS
    subversion/branches/1.8.x/subversion/libsvn_repos/fs-wrap.c

Propchange: subversion/branches/1.8.x/
------------------------------------------------------------------------------
  Merged /subversion/trunk:r1495432,1495446

Modified: subversion/branches/1.8.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1496728&r1=1496727&r2=1496728&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Wed Jun 26 04:00:53 2013
@@ -160,10 +160,3 @@ Veto-blocked changes:
 Approved changes:
 =================
 
- * r1495432, r1495446
-   Allow deleting non-regular properties from nodes.
-   Justification:
-     No way to remove them from historical files that have them.
-   Votes:
-     +1: stsp, danielsh, stefan2
-

Modified: subversion/branches/1.8.x/subversion/libsvn_repos/fs-wrap.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/libsvn_repos/fs-wrap.c?rev=1496728&r1=1496727&r2=1496728&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/libsvn_repos/fs-wrap.c (original)
+++ subversion/branches/1.8.x/subversion/libsvn_repos/fs-wrap.c Wed Jun 26 04:00:53 2013
@@ -172,6 +172,10 @@ svn_repos__validate_prop(const char *nam
 {
   svn_prop_kind_t kind = svn_property_kind2(name);
 
+  /* Allow deleting any property, even a property we don't allow to set. */
+  if (value == NULL)
+    return SVN_NO_ERROR;
+
   /* Disallow setting non-regular properties. */
   if (kind != svn_prop_regular_kind)
     return svn_error_createf



Mime
View raw message