subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From julianf...@apache.org
Subject svn commit: r1644474 - in /subversion/branches/1.8.x-r1643074/subversion: include/private/svn_repos_private.h include/svn_repos.h libsvn_repos/load-fs-vtable.c tests/libsvn_repos/repos-test.c
Date Wed, 10 Dec 2014 16:53:39 GMT
Author: julianfoad
Date: Wed Dec 10 16:53:38 2014
New Revision: 1644474

URL: http://svn.apache.org/r1644474
Log:
On the '1.8.x-r1643074' branch: To avoid a swig-rb bindings failure,^Mdefine a private constant
in a different way.

Modified:
    subversion/branches/1.8.x-r1643074/subversion/include/private/svn_repos_private.h
    subversion/branches/1.8.x-r1643074/subversion/include/svn_repos.h
    subversion/branches/1.8.x-r1643074/subversion/libsvn_repos/load-fs-vtable.c
    subversion/branches/1.8.x-r1643074/subversion/tests/libsvn_repos/repos-test.c

Modified: subversion/branches/1.8.x-r1643074/subversion/include/private/svn_repos_private.h
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x-r1643074/subversion/include/private/svn_repos_private.h?rev=1644474&r1=1644473&r2=1644474&view=diff
==============================================================================
--- subversion/branches/1.8.x-r1643074/subversion/include/private/svn_repos_private.h (original)
+++ subversion/branches/1.8.x-r1643074/subversion/include/private/svn_repos_private.h Wed
Dec 10 16:53:38 2014
@@ -113,6 +113,10 @@ svn_repos__replay_ev2(svn_fs_root_t *roo
                       void *authz_read_baton,
                       apr_pool_t *scratch_pool);
 
+/* A private addition to svn_repos_notify_warning_t. */
+#define svn_repos__notify_warning_invalid_mergeinfo \
+    ((svn_repos_notify_warning_t)(-1))
+
 
 #ifdef __cplusplus
 }

Modified: subversion/branches/1.8.x-r1643074/subversion/include/svn_repos.h
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x-r1643074/subversion/include/svn_repos.h?rev=1644474&r1=1644473&r2=1644474&view=diff
==============================================================================
--- subversion/branches/1.8.x-r1643074/subversion/include/svn_repos.h (original)
+++ subversion/branches/1.8.x-r1643074/subversion/include/svn_repos.h Wed Dec 10 16:53:38
2014
@@ -273,10 +273,7 @@ typedef enum svn_repos_notify_warning_t
    * @see svn_fs.h:"Directory entry names and directory paths" */
   /* ### TODO(doxygen): make that a proper doxygen link */
   /* See svn_fs__path_valid(). */
-  svn_repos_notify_warning_invalid_fspath,
-
-  /* Found invalid mergeinfo */
-  svn_repos__notify_warning_invalid_mergeinfo
+  svn_repos_notify_warning_invalid_fspath
 
 } svn_repos_notify_warning_t;
 

Modified: subversion/branches/1.8.x-r1643074/subversion/libsvn_repos/load-fs-vtable.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x-r1643074/subversion/libsvn_repos/load-fs-vtable.c?rev=1644474&r1=1644473&r2=1644474&view=diff
==============================================================================
--- subversion/branches/1.8.x-r1643074/subversion/libsvn_repos/load-fs-vtable.c (original)
+++ subversion/branches/1.8.x-r1643074/subversion/libsvn_repos/load-fs-vtable.c Wed Dec 10
16:53:38 2014
@@ -40,6 +40,7 @@
 
 #include <apr_lib.h>
 
+#include "private/svn_repos_private.h"
 #include "private/svn_fspath.h"
 #include "private/svn_dep_compat.h"
 #include "private/svn_mergeinfo_private.h"

Modified: subversion/branches/1.8.x-r1643074/subversion/tests/libsvn_repos/repos-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x-r1643074/subversion/tests/libsvn_repos/repos-test.c?rev=1644474&r1=1644473&r2=1644474&view=diff
==============================================================================
--- subversion/branches/1.8.x-r1643074/subversion/tests/libsvn_repos/repos-test.c (original)
+++ subversion/branches/1.8.x-r1643074/subversion/tests/libsvn_repos/repos-test.c Wed Dec
10 16:53:38 2014
@@ -41,6 +41,8 @@
 
 #include "dir-delta-editor.h"
 
+#include "private/svn_repos_private.h"
+
 /* Used to terminate lines in large multi-line string literals. */
 #define NL APR_EOL_STR
 



Mime
View raw message