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

Revert: Update shell rcfiles to indicate the user is already in an activated state (v41). #2787

Merged
merged 2 commits into from
Oct 3, 2023
Merged

Revert: Update shell rcfiles to indicate the user is already in an activated state (v41). #2787

merged 2 commits into from
Oct 3, 2023

Conversation

mitchell-as
Copy link
Contributor

@mitchell-as mitchell-as commented Oct 3, 2023 •
edited by github-actions bot
Loading

StoryDX-2239 Remove virtual environment indication

Reverts #2710 and #2720

@mitchell-as
Revert "Merge pull request #2710 from ActiveState/mitchell/dx-2045"
3ef3ae4 
This reverts commit 796ddea, reversing
changes made to 59bbb9c.
@mitchell-as mitchell-as closed this Oct 3, 2023
@mitchell-as mitchell-as reopened this Oct 3, 2023
@mitchell-as
Copy link
Contributor Author

mitchell-as commented Oct 3, 2023 •
edited
Loading

This PR will fail to propagate due to a conflict in shell_int_test.go. The resolution is to remove the TestNestedShellNotification() function, but leave the existing TestRuby() function. See #2786.

@mitchell-as
Revert "Merge pull request #2720 from ActiveState/mitchell/dx-2136"
7ba990c 
This reverts commit 03d08e6, reversing
changes made to 796ddea.
@mitchell-as mitchell-as changed the title Revert "Merge pull request #2710 from ActiveState/mitchell/dx-2045" Revert: Update shell rcfiles to indicate the user is already in an activated state (v41). Oct 3, 2023
@mitchell-as mitchell-as mentioned this pull request Oct 3, 2023
Closed
@mitchell-as mitchell-as requested a review from Naatan October 3, 2023 20:31
@mitchell-as mitchell-as marked this pull request as ready for review October 3, 2023 20:31
@mitchell-as
Copy link
Contributor Author

@Naatan if you end up approving this, please merge it for me. Propagate-PR WILL fail. When that happens, you can go over to #2786, and if you approve that one, merge it. You'll then have to manually merge up to master I think.

@Naatan Naatan merged commit 427e437 into version/0-41-0-RC2 Oct 3, 2023
10 checks passed
@Naatan Naatan deleted the mitchell/dx-2239-2 branch October 3, 2023 23:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Naatan Naatan Naatan approved these changes

Assignees
No one assigned
Labels
Test: shell
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@mitchell-as @Naatan