You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2015/11/17 10:37:49 UTC
svn commit: r1714741 - in /subversion/trunk: build.conf
subversion/include/private/svn_branch_nested.h
Author: julianfoad
Date: Tue Nov 17 09:37:49 2015
New Revision: 1714741
URL: http://svn.apache.org/viewvc?rev=1714741&view=rev
Log:
Fix some more build problems found by buildbots, following r1714640 and
r1714644.
* build.conf
(svnmover): Remove the 'manpages' line, as there is no manual page.
* subversion/include/private/svn_branch_nested.h
(svn_branch__get_eid_by_rrpath): Add more comment markers so that
the simple regex in build/generator/extractor.py doesn't see this
already commented-out declaration.
Modified:
subversion/trunk/build.conf
subversion/trunk/subversion/include/private/svn_branch_nested.h
Modified: subversion/trunk/build.conf
URL: http://svn.apache.org/viewvc/subversion/trunk/build.conf?rev=1714741&r1=1714740&r2=1714741&view=diff
==============================================================================
--- subversion/trunk/build.conf (original)
+++ subversion/trunk/build.conf Tue Nov 17 09:37:49 2015
@@ -1683,4 +1683,3 @@ path = tools/dev/svnmover
sources = *.c
libs = libsvn_client libsvn_ra libsvn_subr libsvn_delta apriconv apr
install = tools
-manpages = tools/dev/svnmover/svnmover.1
Modified: subversion/trunk/subversion/include/private/svn_branch_nested.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/private/svn_branch_nested.h?rev=1714741&r1=1714740&r2=1714741&view=diff
==============================================================================
--- subversion/trunk/subversion/include/private/svn_branch_nested.h (original)
+++ subversion/trunk/subversion/include/private/svn_branch_nested.h Tue Nov 17 09:37:49 2015
@@ -73,10 +73,10 @@ svn_branch__get_rrpath_by_eid(const svn_
*
* ### TODO: Clarify sequencing requirements.
*/
-/*int
-svn_branch__get_eid_by_rrpath(svn_branch__state_t *branch,
- const char *rrpath,
- apr_pool_t *scratch_pool);*/
+/*int*/
+/*svn_branch__get_eid_by_rrpath(svn_branch__state_t *branch,*/
+/* const char *rrpath,*/
+/* apr_pool_t *scratch_pool);*/
/* Find the (deepest) branch of which the path RELPATH is either the root
* path or a normal, non-sub-branch path. An element need not exist at