subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From svn-r...@apache.org
Subject svn commit: r1670555 - in /subversion/branches/1.9.x: ./ STATUS subversion/include/private/svn_dep_compat.h subversion/include/private/svn_sorts_private.h subversion/include/svn_opt.h subversion/libsvn_wc/wc_db.h
Date Wed, 01 Apr 2015 04:00:10 GMT
Author: svn-role
Date: Wed Apr  1 04:00:10 2015
New Revision: 1670555

URL: http://svn.apache.org/r1670555
Log:
Merge r1663355 from trunk:

 * r1663355
   Fix #include guards and Doxygen mark-up that does not match a file's actual
   name.
   Justification:
     Simple corrections to documentation and source code; no functional
     change. The only public symbol affected is the include-guard symbol
     SVN_OPTS_H renamed to SVN_OPT_H.
   Votes:
     +1: julianfoad, rhuijben, stefan2

Modified:
    subversion/branches/1.9.x/   (props changed)
    subversion/branches/1.9.x/STATUS
    subversion/branches/1.9.x/subversion/include/private/svn_dep_compat.h
    subversion/branches/1.9.x/subversion/include/private/svn_sorts_private.h
    subversion/branches/1.9.x/subversion/include/svn_opt.h
    subversion/branches/1.9.x/subversion/libsvn_wc/wc_db.h

Propchange: subversion/branches/1.9.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr  1 04:00:10 2015
@@ -89,4 +89,4 @@
 /subversion/branches/verify-at-commit:1462039-1462408
 /subversion/branches/verify-keep-going:1439280-1546110
 /subversion/branches/wc-collate-path:1402685-1480384
-/subversion/trunk:1660545-1660547,1660549-1662901,1663003,1663183-1663184,1663338,1663347,1663374,1663450,1663697,1663706,1663738,1663749,1663791,1664078,1664080,1664084-1664085,1664187,1664191,1664193,1664200,1664344,1664476,1664480-1664481,1664483,1664507,1664520-1664521,1664523,1664526-1664527,1664531-1664532,1664588,1664653,1664684,1664927,1664997,1665164,1665195,1665437-1665438,1665611-1665612,1665845,1665850,1665852,1665886,1665894,1665896,1666096,1666270,1666272,1666379,1666449,1666690,1666851,1667101,1667106-1667107,1667941,1667976,1668598,1668600,1668602-1668603,1670329
+/subversion/trunk:1660545-1660547,1660549-1662901,1663003,1663183-1663184,1663338,1663347,1663355,1663374,1663450,1663697,1663706,1663738,1663749,1663791,1664078,1664080,1664084-1664085,1664187,1664191,1664193,1664200,1664344,1664476,1664480-1664481,1664483,1664507,1664520-1664521,1664523,1664526-1664527,1664531-1664532,1664588,1664653,1664684,1664927,1664997,1665164,1665195,1665437-1665438,1665611-1665612,1665845,1665850,1665852,1665886,1665894,1665896,1666096,1666270,1666272,1666379,1666449,1666690,1666851,1667101,1667106-1667107,1667941,1667976,1668598,1668600,1668602-1668603,1670329

Modified: subversion/branches/1.9.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x/STATUS?rev=1670555&r1=1670554&r2=1670555&view=diff
==============================================================================
--- subversion/branches/1.9.x/STATUS (original)
+++ subversion/branches/1.9.x/STATUS Wed Apr  1 04:00:10 2015
@@ -242,16 +242,6 @@ Veto-blocked changes:
 Approved changes:
 =================
 
- * r1663355
-   Fix #include guards and Doxygen mark-up that does not match a file's actual
-   name.
-   Justification:
-     Simple corrections to documentation and source code; no functional
-     change. The only public symbol affected is the include-guard symbol
-     SVN_OPTS_H renamed to SVN_OPT_H.
-   Votes:
-     +1: julianfoad, rhuijben, stefan2
-
  * r1665318
    Make lock/unlock result reporting consistent over ra layers and fs backends
    Justification:

Modified: subversion/branches/1.9.x/subversion/include/private/svn_dep_compat.h
URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x/subversion/include/private/svn_dep_compat.h?rev=1670555&r1=1670554&r2=1670555&view=diff
==============================================================================
--- subversion/branches/1.9.x/subversion/include/private/svn_dep_compat.h (original)
+++ subversion/branches/1.9.x/subversion/include/private/svn_dep_compat.h Wed Apr  1 04:00:10
2015
@@ -20,7 +20,7 @@
  * ====================================================================
  * @endcopyright
  *
- * @file svn_compat.h
+ * @file svn_dep_compat.h
  * @brief Compatibility macros and functions.
  * @since New in 1.5.0.
  */

Modified: subversion/branches/1.9.x/subversion/include/private/svn_sorts_private.h
URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x/subversion/include/private/svn_sorts_private.h?rev=1670555&r1=1670554&r2=1670555&view=diff
==============================================================================
--- subversion/branches/1.9.x/subversion/include/private/svn_sorts_private.h (original)
+++ subversion/branches/1.9.x/subversion/include/private/svn_sorts_private.h Wed Apr  1 04:00:10
2015
@@ -20,7 +20,7 @@
  * ====================================================================
  * @endcopyright
  *
- * @file svn_sorts.h
+ * @file svn_sorts_private.h
  * @brief all sorts of sorts.
  */
 

Modified: subversion/branches/1.9.x/subversion/include/svn_opt.h
URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x/subversion/include/svn_opt.h?rev=1670555&r1=1670554&r2=1670555&view=diff
==============================================================================
--- subversion/branches/1.9.x/subversion/include/svn_opt.h (original)
+++ subversion/branches/1.9.x/subversion/include/svn_opt.h Wed Apr  1 04:00:10 2015
@@ -24,8 +24,8 @@
  * @brief Option and argument parsing for Subversion command lines
  */
 
-#ifndef SVN_OPTS_H
-#define SVN_OPTS_H
+#ifndef SVN_OPT_H
+#define SVN_OPT_H
 
 #include <apr.h>
 #include <apr_pools.h>
@@ -780,4 +780,4 @@ svn_opt_print_help(apr_getopt_t *os,
 }
 #endif /* __cplusplus */
 
-#endif /* SVN_OPTS_H */
+#endif /* SVN_OPT_H */

Modified: subversion/branches/1.9.x/subversion/libsvn_wc/wc_db.h
URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x/subversion/libsvn_wc/wc_db.h?rev=1670555&r1=1670554&r2=1670555&view=diff
==============================================================================
--- subversion/branches/1.9.x/subversion/libsvn_wc/wc_db.h (original)
+++ subversion/branches/1.9.x/subversion/libsvn_wc/wc_db.h Wed Apr  1 04:00:10 2015
@@ -20,7 +20,7 @@
  * ====================================================================
  * @endcopyright
  *
- * @file svn_wc_db.h
+ * @file wc_db.h
  * @brief The Subversion Working Copy Library - Metadata/Base-Text Support
  *
  * Requires:



Mime
View raw message