Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Ensure direct tool requires conflicts are properly reported instead of hanging #16619

Merged
merged 1 commit into from
Jul 8, 2024
Merged

Ensure direct tool requires conflicts are properly reported instead of hanging #16619

merged 1 commit into from
Jul 8, 2024

Conversation

AbrilRBS
Copy link
Member

@AbrilRBS AbrilRBS commented Jul 5, 2024 •
edited by czoido
Loading

Changelog: Fix: Ensure direct tool requires conflicts are properly reported instead of hanging.
Docs: Omit

@AbrilRBS @ErniGH
@perseoGI @memsharded
Ensure direct tool requires conflicts are properly reported and Conan…
48eb676 
… does not hang

---------

Co-authored-by: ErniGH <ernestodgh@jfrog.com>
Co-authored-by: PerseoGI <perseog@jfrog.com>
Co-authored-by: memsharded <james@conan.io>
@AbrilRBS AbrilRBS added this to the 2.6.0 milestone Jul 5, 2024
memsharded
memsharded approved these changes Jul 5, 2024
View reviewed changes
Copy link
Member

@memsharded memsharded left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The XCRun test refactor is unrelated to this PR, better do it separately as a general rule (I think it can be left here as it is already done and the change is trivial)

@AbrilRBS
Copy link
Member Author

AbrilRBS commented Jul 5, 2024 •
edited
Loading

Oh noes, the curse of git add . strikes again! Commited by mistake, was meant to go in a separate PR after I looked into the rst of the integration tests to double-check that nothing uses actual programs

@memsharded
Copy link
Member

Oh noes, the curse of git add . strikes again! Commited by mistake, was meant to go in a separate PR after I looked into the rst of the integration tests to double-check that nothing uses actual programs

Not a big deal! It can stay, not worth the effort to move it to another PR now

perseoGI
perseoGI approved these changes Jul 8, 2024
View reviewed changes
Copy link
Contributor

@perseoGI perseoGI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@czoido czoido merged commit 8550fba into conan-io:develop2 Jul 8, 2024
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ErniGH ErniGH ErniGH approved these changes

@perseoGI perseoGI perseoGI approved these changes

@memsharded memsharded memsharded approved these changes

Assignees

@czoido czoido

Labels
None yet
Projects
None yet
Milestone
2.6.0
Development

Successfully merging this pull request may close these issues.
5 participants
@AbrilRBS @memsharded @perseoGI @ErniGH @czoido