The GitHub Actions job "Build and Test Subversion with CMake" on subversion.git has failed. Run started by GitHub user asfgit (triggered by asfgit).
Head commit for run: ee6ce43c398c8c860179e894d68b13ac5621422a / Timofei Zhakov <rin...@apache.org> On the 'apply-processor' branch: Add cb_table->adjust_merge_source() callback whose implementations may adjust the source for tree conflict. * subversion/libsvn_client/client.h (svn_client__apply_processor_callbacks_t): Add adjust_merge_source method. * subversion/libsvn_client/merge.c (apply_processor_adjust_merge_source): Implement function. (do_merge): Initialize cb_table.adjust_merge_source with a pointer to the apply_processor_adjust_merge_source function. * subversion/libsvn_client/merge_processor.c (record_tree_conflict): Move code disabled by TODO_FILTER_MERGEINFO to merge.c::apply_processor_adjust_merge_source(), but call it instead, do a little rearrangement of the local variables, invoke make_conflict_versions() once, but use the adjusted source. git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/apply-processor@1922163 13f79535-47bb-0310-9956-ffa450edef68 Report URL: https://github.com/apache/subversion/actions/runs/12052015545 With regards, GitHub Actions via GitBox
