See <http://hudson.zones.apache.org/hudson/job/subversion-trunk-solaris/969/changes>
Changes: [pburba] Fix issue #3242 as concerns reintegrate merges. Reintegrate merges now succeed even when the user is not authorized to the parents of the reintegrate source and/or target. * subversion/include/private/svn_mergeinfo_private.h (svn_mergeinfo__add_prefix_to_catalog): New. * subversion/libsvn_client/merge.c (merge_cousins_and_supplement_mergeinfo): Accept two svn_ra_session_t, one for each URL of the two-URL merge being performed. Stop with all the now unnecessary reparenting. (merge_locked): Update call to merge_cousins_and_supplement_mergeinfo, passing along the second RA session, which we conveniently already opened. (find_unsynced_ranges): Expect incoming RA session to point at the reintegrate target, rather than the repos root. (find_unmerged_mergeinfo, calculate_left_hand_side): Accept two RA sessions, one for the reintegrate source and one for the target, rather than a single RA session for the root of the repository. Stop unnecessary reparenting. (merge_reintegrate_locked): Open two RA sessions and pass them along to merge_cousins_and_supplement_mergeinfo(). Remove the 'FIXME' that started all this. * subversion/libsvn_subr/mergeinfo.c (svn_mergeinfo__add_prefix_to_catalog): New. * subversion/tests/cmdline/merge_authz_tests.py (reintegrate_fails_if_no_root_access): Move update before changing to restrictive authz, otherwise it will fail. Remove comment about XFail status. (test_list): Remove XFail from reintegrate_fails_if_no_root_access. ------------------------------------------ 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/include/private/svn_mergeinfo_private.h U subversion/libsvn_subr/mergeinfo.c U subversion/libsvn_client/merge.c U subversion/tests/cmdline/merge_authz_tests.py At revision 946774 [subversion-trunk-solaris] $ /bin/bash -xe /var/tmp/hudson7142454765268630228.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
