See
<http://hudson.zones.apache.org/hudson/job/subversion-trunk-solaris/903/changes>
Changes:
[gstein] Collect more work items into internal_merge's returned items.
* subversion/libsvn_wc/merge.c:
(eval_conflict_func_result, preserve_pre_merge_files,
merge_binary_file): return WORK_ITEMS and take a RESULT_POOL for
those items' allocation.
(maybe_resolve_conflicts): accept work items from
eval_conflict_func_result and preserve_pre_merge_files, and merge them
into the resulting set of work items
(svn_wc__internal_merge): get work items from merge_binary_file.
------------------------------------------
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/merge.c
At revision 942651
[subversion-trunk-solaris] $ /bin/bash -xe /var/tmp/hudson7548926152871797083.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
