[4.0] Fix wrong since tag coming from upmerge with deploy version #35551
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
richard67
requested review from
rdeutz,
wilsonge and
zero-24
as code owners
|
I have tested this item ✅ successfully on 89b4232 This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/35551. |
1 similar comment
|
I have tested this item ✅ successfully on 89b4232 This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/35551. |
|
RTC This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/35551. |
|
Thanks! |
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.
Pull Request for Issue # .
Summary of Changes
After the upmerge from 3.10-dev into 4.0-dev has been made with this commit 6615552, the version bump was made on both branches for the RC versions.
Therefore a change has been merged up with a "@SInCE" tag equal to "DEPLOY_VERSION", and the version bump after that has created that "@SInCE" tag with two different versions on the two branches for the same thing.
See here https://github.com/joomla/joomla-cms/blob/3.10-dev/libraries/src/Updater/Update.php#L223 for the right tag on 3.10-dev and here https://github.com/joomla/joomla-cms/blob/4.0-dev/libraries/src/Updater/Update.php#L225 for the wrong tag in the 4.0-dev branch.
This PR here fixes that.
Testing Instructions
Code review.
Actual result BEFORE applying this Pull Request
@since 4.0.3Expected result AFTER applying this Pull Request
@since 3.10.2Documentation Changes Required
None.