See
<http://hudson.zones.apache.org/hudson/job/subversion-trunk-solaris/902/changes>
Changes:
[gstein] Propagate work items out of svn_wc__internal_merge() rather than
directly
queuing them. The two callers now queue the resulting work item(s).
* subversion/libsvn_wc/wc.h:
(svn_wc__internal_merge): add a WORK_ITEMS OUT parameter, and a
RESULT_POOL parameter. update docstring.
* subversion/libsvn_wc/merge.c:
(save_merge_result): return the constructed work item rather than
queueing it. add a WORK_ITEM param to do this, and a RESULT_POOL.
(maybe_resolve_conflicts): return WORK_ITEMS (a new param) instead of
directly queueing results. add a RESULT_POOL for the work items.
(merge_text_file): return WORK_ITEMS instead of queuing. add a
RESULT_POOL for these items. rather than queuing the OP_FILE_INSTALL,
merge it into the returned set of work items.
(svn_wc__internal_merge): accept a new WORK_ITEMS parameter and an
additional RESULT_POOL. accumulate work items, and return them.
(svn_wc_merge4): get work items __internal_merge and queue them before
running the queue.
* subversion/libsvn_wc/update_editor.c:
(merge_file): get a work item from internal_merge() and shove that into
the WORK_ITEMS returned by this function
------------------------------------------
Started by an SCM change
Building remotely on lucene.zones.apache.org (Solaris 10)
Updating https://svn.apache.org/repos/asf/subversion/trunk
U subversion/libsvn_wc/wc.h
U subversion/libsvn_wc/update_editor.c
U subversion/libsvn_wc/merge.c
At revision 942637
[subversion-trunk-solaris] $ /bin/bash -xe /var/tmp/hudson256114436396574468.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
