Re-sort module properties after merging #3957
Merged
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
HebaruSan
added
Bug
Easy
HebaruSan
force-pushed
the
fix/merge-prop-sort
branch
from
86fa6cd
to
94e9e91
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.
Problem
After merging KSP-CKAN/NetKAN#9882, I noticed
ksp_versionwas appearing out of its normal ordering:Cause
The GitHub module has no versioning info at all, whereas the one from SpaceDock has a game version, and otherwise they're identical, so the merge code is appending just that one property from the SpaceDock module onto the GitHub module after it's sorted.
Changes
Now the merge logic reapplies sorting, so multi-host .ckans will have the same property ordering as single-host ones.