See
<http://hudson.zones.apache.org/hudson/job/subversion-trunk-solaris/912/changes>
Changes:
[gstein] Remove the BASE_MERGE parameter from svn_wc_merge_props3().
For this function's ancestors, which continue to have BASE_MERGE, we will
now THROW AN ERROR. With more work, we can restore the operation of this
parameter, but I do not believe it to be useful/advisable/worthwhile. The
code is mostly still present, pending discussion.
A new errata has been filed to detail this issue, also noting that several
clients do not attempt to use this removed functionality.
* subversion/include/svn_wc.h:
(svn_wc_merge_props3): remove the BASE_MERGE parameter. update the
docstring.
(svn_wc_merge_props2): discuss the BASE_MERGE parameter.
* subversion/libsvn_wc/props.h:
(SVN__SUPPORT_BASE_MERGE): temporary(?) define to wrap functionality
that can/should be removed, or can be restored (with some fixes) to
support BASE_MERGE.
(svn_wc__perform_props_merge): a new internal function that is wrapped
by svn_wc_merge_props3, but *does* support BASE_MERGE.
* subversion/libsvn_wc/props.c:
(queue_install_props): remove this function from compilation, based on
the SVN__SUPPORT_BASE_MERGE define.
(svn_wc_merge_props3): renamed to ...
(svn_wc__perform_props_merge): ... this. swap a DB param for a WC_CTX.
only make the call to queue_install_props if SVN__SUPPORT_BASE_MERGE
is defined. otherwise, update the actual props along with queueing a
work item to establish the old-style props file.
(svn_wc_merge_props3): reintroduced as a simple wrapper for
svn_wc__perform_props_merge.
* subversion/libsvn_wc/deprecated.c:
(svn_wc_merge_props2): call svn_wc__perform_props_merge instead of
svn_wc_merge_props3. side benefit of no wc_ctx needed.
* subversion/libsvn_wc/workqueue.h:
(svn_wc__wq_add_install_properties): only declare when
SVN__SUPPORT_BASE_MERGE is defined.
* subversion/libsvn_wc/workqueue.c:
(run_install_propertes, svn_wc__wq_add_install_properties): only
declare when SVN__SUPPORT_BASE_MERGE is defined.
(dispatch_table): add handler for OP_INSTALL_PROPERTIES only when
SVN__SUPPORT_BASE_MERGE.
* subversion/libsvn_client/merge.c:
(merge_props_changed): remove BASE_MERGE param from call
* notes/api-errata/wc006.txt: new errata
------------------------------------------
Started by an SCM change
Building remotely on lucene.zones.apache.org (Solaris 10)
Updating https://svn.apache.org/repos/asf/subversion/trunk
AU notes/api-errata/wc006.txt
U subversion/include/svn_wc.h
U subversion/libsvn_wc/deprecated.c
U subversion/libsvn_wc/props.c
U subversion/libsvn_wc/props.h
U subversion/libsvn_wc/workqueue.c
U subversion/libsvn_wc/workqueue.h
U subversion/libsvn_client/merge.c
At revision 942999
[subversion-trunk-solaris] $ /bin/bash -xe /var/tmp/hudson8220721979246501693.sh
+ cd subversion-trunk
+
PATH=/export/home/hudson/bin:/export/home/hudson/tools/java/latest/bin:/export/home/hudson/tools/ant/latest/bin:/export/home/hudson/tools/tomcat/latest/bin:/opt/subversion-current/bin:/usr/ucb:/usr/local/bin:/usr/bin:/usr/sfw/bin:/usr/sfw/sbin:/opt/sfw/bin:/opt/sfw/sbin:/opt/SUNWspro/bin:/usr/X/bin:/usr/ucb:/usr/sbin:/usr/ccs/bin:/usr/bin
+ export PATH
+ /usr/ccs/bin/make clean
make: Fatal error: Don't know how to make target `clean'
Recording test results
