The GitHub Actions job "CMake" on subversion.git has succeeded.
Run started by GitHub user asfgit (triggered by asfgit).

Head commit for run:
96e88223f92bc94f11a2e89636bf6e7b5c24a21f / Timofei Zhakov <rin...@apache.org>
In the trunk, at the merge: Revert changes in record_skip() and
record_tree_conflict() functions, since we cannot rely that the parent
baton passed is not NULL. We do only in tree-processor implementation,
where we explicitly check for that.

This is a follow-up to r1922328 (Cleanup some checks of the parent directory
baton for NULL).

A problem somehow reproduced in the 'apply-processor' branch after
merging r1922328, but unfortunately hasn't failed in trunk before.

* subversion/libsvn_client/merge.c
  (record_skip, record_tree_conflict): Ditto. 


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1922347 
13f79535-47bb-0310-9956-ffa450edef68

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

With regards,
GitHub Actions via GitBox

Reply via email to