subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From svn-r...@apache.org
Subject svn commit: r1400360 - in /subversion/branches/1.7.x: ./ STATUS subversion/libsvn_repos/load-fs-vtable.c
Date Sat, 20 Oct 2012 04:03:26 GMT
Author: svn-role
Date: Sat Oct 20 04:03:25 2012
New Revision: 1400360

URL: http://svn.apache.org/viewvc?rev=1400360&view=rev
Log:
Merge r1237779 from trunk:

 * r1237779
   Fix sense of property validation on load and make the revprop change atomic.
   Justification:
     Validation is supposed to be on by default but is off, adding
     --bypass-prop-validation switches it on.
   Votes:
     +1: philip, cmpilato, danielsh

Modified:
    subversion/branches/1.7.x/   (props changed)
    subversion/branches/1.7.x/STATUS
    subversion/branches/1.7.x/subversion/libsvn_repos/load-fs-vtable.c

Propchange: subversion/branches/1.7.x/
------------------------------------------------------------------------------
  Merged /subversion/trunk:r1237779

Modified: subversion/branches/1.7.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1400360&r1=1400359&r2=1400360&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Sat Oct 20 04:03:25 2012
@@ -94,14 +94,6 @@ Veto-blocked changes:
 Approved changes:
 =================
 
- * r1237779
-   Fix sense of property validation on load and make the revprop change atomic.
-   Justification:
-     Validation is supposed to be on by default but is off, adding
-     --bypass-prop-validation switches it on.
-   Votes:
-     +1: philip, cmpilato, danielsh
-
  * r1398100
    Add missing 'prop-mods' and 'text-mods' attributes in the changed paths
    section of the output of 'log -v --xml'.  When these attributes were

Modified: subversion/branches/1.7.x/subversion/libsvn_repos/load-fs-vtable.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/libsvn_repos/load-fs-vtable.c?rev=1400360&r1=1400359&r2=1400360&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/libsvn_repos/load-fs-vtable.c (original)
+++ subversion/branches/1.7.x/subversion/libsvn_repos/load-fs-vtable.c Sat Oct 20 04:03:25
2012
@@ -154,12 +154,12 @@ change_rev_prop(svn_repos_t *repos,
                 apr_pool_t *pool)
 {
   if (validate_props)
-    return svn_fs_change_rev_prop2(svn_repos_fs(repos), revision, name,
-                                   NULL, value, pool);
-  else
     return svn_repos_fs_change_rev_prop4(repos, revision, NULL, name,
                                          NULL, value, FALSE, FALSE,
                                          NULL, NULL, pool);
+  else
+    return svn_fs_change_rev_prop2(svn_repos_fs(repos), revision, name,
+                                   NULL, value, pool);
 }
 
 /* Change property NAME to VALUE for PATH in TXN_ROOT.  If



Mime
View raw message