See
<http://hudson.zones.apache.org/hudson/job/subversion-trunk-solaris/904/changes>
Changes:
[gstein] We can now skip some immediate queuing of work items, since we can
order
them properly against the merge_file() work. We still need to handle the
ACTUAL props earlier than desired, but we can (at least) omit the work
item queueing.
* subversion/libsvn_wc/update_editor.c:
(close_file): don't force queuing of the old-style props file
installation operations. they can go in with the rest, since we now
order them properly.
[gstein] Simplify the code path for resolving text conflicts on a file when it
is
restored.
* subversion/libsvn_wc/conflicts.h:
(svn_wc__resolve_text_conflict): new helper function to resolve text
conflicts on a file
* subversion/libsvn_wc/wc.h:
(svn_wc__internal_resolved_conflict): removed. unused.
* subversion/libsvn_wc/conflicts.c:
(resolve_conflict_on_node): initialize the DID_RESOLVE OUT param
(svn_wc__resolve_text_conflict): new helper, as a simple wrapper around
resolve_conflict_on_node
(resolve_one_conflict): remove CANCEL_FUNC/BATON. calling that within
the granularity of looping over an individual node's conflicts is way
way too much. add parameter comments on calls to lower funcs. add a
note that RESOLVE_PROP *cannot* be used to resolve a single prop
conflict.
(recursive_resolve_conflict): remove CANCEL_FUNC/BATON on call to
resolve_one_conflict
(svn_wc__internal_resolved_conflict): removed
(svn_wc_resolved_conflict5): move DEPTH adjust from
internal_resolved_conflict to here. add a check for unimplemented
RESOLVE_PROP behavior (see resolve_one_conflict comment and
resolve_conflict_on_node behavior). call recursive_resolve_conflict
directly instead of the "internal" func.
* subversion/libsvn_wc/adm_crawler.c:
(restore_file): call svn_wc__resolve_text_conflict rather than the
overpowered internal_resolved_conflict.
------------------------------------------
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/conflicts.c
U subversion/libsvn_wc/update_editor.c
U subversion/libsvn_wc/conflicts.h
U subversion/libsvn_wc/adm_crawler.c
At revision 942657
[subversion-trunk-solaris] $ /bin/bash -xe /var/tmp/hudson5437653022209853602.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
