We require contributors to sign our Contributor License Agreement and we don't have one on file for @woutdenolf.

In order for us to review and merge your code, please e-sign the Contributor License Agreement PDF. We then need to manually verify your signature, merge the PR (conda/infrastructure#806), and ping the bot to refresh the PR.

@conda-bot check-cla

For reference, this is a fix of another fix: #1546

Hi there, thank you for your contribution!

This pull request has been automatically marked as stale because it has not had recent activity. It will be closed automatically if no further activity occurs.

If you would like this pull request to remain open please:

1. Rebase and verify the changes still work
2. Leave a comment with the current status

NOTE: If this pull request was closed prematurely, please leave a comment.

Thanks!

I rebased again on main.

CodSpeed Performance Report

Merging #4977 will not alter performance

_{Comparing woutdenolf:4976-merge_tree-bug-in-checking-for-subdirectory (5fe1a03) with main (6e6bb13)}

Summary

✅ 5 untouched benchmarks

Well this is annoying? IIUIC, the test suite is failing on deprecations that have not been addressed within conda. That shouldn't block conda build PRs.

Did I get that right?

Ideas @jezdez @jaimergp @kenodegard ?

@beckermr Yeah, we recently changed the conda.plan upstream in conda/conda#14603, which is why this is showing up for canary tests now. I've added the line to the config to ignore the pending deprecation for now (as we've done before).

Ah thank you @jezdez!