FIX Handle linkfield 3.0 branch #33
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
GuySartorelli
requested changes
Apr 9, 2024
funcs.php
Outdated
| return version_compare($branch, $doNotMergeUpFromMajor, '>'); | ||
| return version_compare($branch, "$doNotMergeUpFromMajor.0", '>'); |
There was a problem hiding this comment.
I think we need to be a bit more sophisticated than this - we need to handle 3, 3.0, and any theoretical 3.x branches, since this is intended to be a general solution we can reuse in the future, not just for linkfield.
There was a problem hiding this comment.
Unless I've misunderstood - in which case please add a test for 3.3 or something to validate that it will handle all those as well.
There was a problem hiding this comment.
Good spot, yes would have broken on 3.1. Have updated and added tests.
emteknetnz
force-pushed
the
pulls/1.0/linkfield3
branch
from
2915612 to
e254a45
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.
Issue silverstripe/.github#219
Linkfield 3.0 branch did not exist when the patch for not merge up linkfield v3 originally went in. Since then I created a 3.0 branch when I did the 3.0.0 stable tag