See
<http://hudson.zones.apache.org/hudson/job/subversion-trunk-solaris/951/changes>
Changes:
[pburba] * subversion/tests/cmdline/merge_tests.py:
(basic_reintegrate): Show the right command and error in the comment.
[pburba] Extend an existing merge test to cover issue #3640.
* subversion/tests/cmdline/merge_tests.py
(basic_reintegrate): Extend test.
(test_list): Set basic_reintegrate to XFail while I work on a fix.
[gstein] Another tweak to svn_wc__props_modified(). We can use
load_actual_props()
and load_pristine_props(), but we have to throw out the "replaced" check.
On today's working copies, the check is wrong. load_actual_props will
return "the current set of props", which may be a copy of the pristine
props. The load_props call would return NULL if no changes were present.
Thus, we cannot early-out on a replaced node since we must do a comparison
against the pristines to look for changes.
* subversion/libsvn_wc/props.c:
(svn_wc__props_modified): no early-out for LOCALPROPS=NULL since that
will never happen (we at least return an empty set). stub out the
check for a 'replaced' node. remove the alternate implementations for
when USE_DB_PROPS is not defined.
------------------------------------------
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/props.c
U subversion/tests/cmdline/merge_tests.py
At revision 945917
[subversion-trunk-solaris] $ /bin/bash -xe /var/tmp/hudson3944299908751321153.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
