The GitHub Actions job "Build and Test Subversion using autoconf build system" 
on subversion.git has failed.
Run started by GitHub user asfgit (triggered by asfgit).

Head commit for run:
8e5f7e6d1520e550cbea6088f315f46c44fc2fa1 / Timofei Zhakov <rin...@apache.org>
On the 'apply-processor' branch: Inline cb_table->conflicted_path callback,
but use the notification callback instead; This callback and its usages are
more complicated than updated_path and skipped_path, but it seems that they
could be inlined as well.

* subversion/libsvn_client/client.h
  (svn_client__apply_processor_callbacks_t::conflicted_path): Remove method.
* subversion/libsvn_client/merge.c
  (notify_merging): Handle svn_wc_notify_tree_conflict action, and this path
   in conflicted_paths and tree_conflicted_abspaths. If any of content or
   props are getting conflicted, add the path to conflicted_paths. This does
   logically the same as it did before the refactoring.
  (apply_processor_conflicted_paths): Remove function.
  (do_merge): Do not initialize cb_table.conflicted_paths.
* subversion/libsvn_client/merge_processor.c
  (): No longer invoke cb_table->conflicted_paths() callback, since we are
   removing it.

git-svn-id: 
https://svn.apache.org/repos/asf/subversion/branches/apply-processor@1922144 
13f79535-47bb-0310-9956-ffa450edef68

Report URL: https://github.com/apache/subversion/actions/runs/12041164831

With regards,
GitHub Actions via GitBox

Reply via email to