[#35551] - [4.0] Fix wrong since tag coming from upmerge with deploy version
- Fixed in Code Base
- 13 Sep 2021
- Medium
- Build: 4.0-dev
- # 35551
- Diff
- richard67:4.0-dev-fix-deploy-version-after-upmerge
User tests: Successful: Unsuccessful:
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.3
Expected result AFTER applying this Pull Request
@since 3.10.2
Documentation Changes Required
None.
| Status | New | ⇒ | Pending |
joomla-cms-bot
- | Category | ⇒ | Libraries |
I have tested this item
This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/35551.
| Status | Pending | ⇒ | Ready to Commit |
RTC
This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/35551.
| Status | Ready to Commit | ⇒ | Fixed in Code Base |
| Closed_Date | 0000-00-00 00:00:00 | ⇒ | 2021-09-13 21:03:55 |
| Closed_By | ⇒ | wilsonge | |
| Labels |
Added:
?
?
|
||
Thanks!
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.