Use fork markers and fork preferences in resolution with lockfile #5481
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
konstin
force-pushed
the
konsti/add-forks-to-lockfile
branch
from
d5c695d
to
2059be1
Compare
konstin
force-pushed
the
konsti/merge-identical-resolutions
branch
3 times, most recently
from
3995731
to
157f10b
Compare
konstin
force-pushed
the
konsti/add-forks-to-lockfile
branch
from
2059be1
to
f149824
Compare
konstin
force-pushed
the
konsti/merge-identical-resolutions
branch
from
157f10b
to
ff4651c
Compare
konstin
force-pushed
the
konsti/add-forks-to-lockfile
branch
from
f149824
to
9ff639c
Compare
konstin
force-pushed
the
konsti/merge-identical-resolutions
branch
from
ff4651c
to
6f29c03
Compare
konstin
force-pushed
the
konsti/add-forks-to-lockfile
branch
from
9ff639c
to
759a1be
Compare
konstin
force-pushed
the
konsti/merge-identical-resolutions
branch
from
6f29c03
to
171dcb4
Compare
konstin
force-pushed
the
konsti/add-forks-to-lockfile
branch
from
759a1be
to
287463f
Compare
konstin
force-pushed
the
konsti/merge-identical-resolutions
branch
from
171dcb4
to
a1e82fd
Compare
konstin
force-pushed
the
konsti/add-forks-to-lockfile
branch
3 times, most recently
from
8aff9ae
to
f521fdf
Compare
konstin
force-pushed
the
konsti/merge-identical-resolutions
branch
from
a1e82fd
to
662f87d
Compare
konstin
force-pushed
the
konsti/add-forks-to-lockfile
branch
from
f521fdf
to
4b1ca1f
Compare
konstin
force-pushed
the
konsti/merge-identical-resolutions
branch
from
662f87d
to
100e160
Compare
With this change, the "preferences-dependent-forking" packse scenario becomes stable.
konstin
force-pushed
the
konsti/merge-identical-resolutions
branch
from
b0e3552
to
87ead41
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
By resolving for each fork from the lockfile individually and by adding using preferences for the current fork, we solve the instability #5180. I've tested the locally and will add the packse test scenarios upstack.
Part of #5180 (comment)