Skip to content

Revert "refine location comparison when pre-loading package (#7002)" #7031

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
Merged
merged 1 commit into from
Oct 25, 2023
Merged

Revert "refine location comparison when pre-loading package (#7002)" #7031

merged 1 commit into from
Oct 25, 2023

Conversation

MaxDesiatov
Copy link
Contributor

@MaxDesiatov MaxDesiatov commented Oct 24, 2023 •
edited
Loading

I've verified that the reverted commit removes required packages from Package.resolved in certain dependency graphs.

This reverts commit 1491d34.

# Conflicts:
#	Sources/Workspace/Workspace+Manifests.swift
#	Sources/Workspace/Workspace.swift

Resolves rdar://117381924.

@MaxDesiatov
Revert "refine location comparison when pre-loading package state fro…
7a77de0 
…m local state (#7002)"

I've verified that the reverted commit removes required packages from `Package.resolved` in certain dependency graphs.

This reverts commit 1491d34.

# Conflicts:
#	Sources/Workspace/Workspace+Manifests.swift
#	Sources/Workspace/Workspace.swift

Resolves rdar://117381924.
@MaxDesiatov MaxDesiatov self-assigned this Oct 24, 2023
@MaxDesiatov MaxDesiatov changed the title Revert "refine location comparison when pre-loading package state fro… Revert "refine location comparison when pre-loading package (#7002)" Oct 24, 2023
@MaxDesiatov
Copy link
Contributor Author

@swift-ci test

@MaxDesiatov MaxDesiatov enabled auto-merge (squash) October 24, 2023 23:24
@tomerd
Copy link
Contributor

tomerd commented Oct 25, 2023

fix forward alternative: #7034

@MaxDesiatov
Copy link
Contributor Author

@swift-ci test macos

@MaxDesiatov
Copy link
Contributor Author

@swift-ci test windows

@MaxDesiatov MaxDesiatov merged commit e026c16 into main Oct 25, 2023
@MaxDesiatov MaxDesiatov deleted the maxd/revert-location-comparison branch October 25, 2023 11:37
tomerd added a commit that referenced this pull request Oct 25, 2023
@tomerd
Revert "Revert "refine location comparison when pre-loading package (#…
cd7da60 
…7002)" (#7031)"

This reverts commit e026c16.
@tomerd tomerd mentioned this pull request Oct 25, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@neonichu neonichu neonichu approved these changes

@tomerd tomerd Awaiting requested review from tomerd

Assignees

@MaxDesiatov MaxDesiatov

Labels
bug
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@MaxDesiatov @tomerd @neonichu