Merge ~bryce/ubuntu/+source/php-defaults:7.4-transition into ubuntu/+source/php-defaults:debian/sid
Status: | Superseded |
---|---|
Proposed branch: | ~bryce/ubuntu/+source/php-defaults:7.4-transition |
Merge into: | ubuntu/+source/php-defaults:debian/sid |
Diff against target: |
102 lines (+35/-6) 4 files modified
debian/changelog (+29/-0) debian/control (+3/-4) debian/control.in (+2/-1) debian/rules (+1/-1) |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Andreas Hasenack (community) | Needs Information | ||
Review via email: mp+379596@code.staging.launchpad.net |
This proposal has been superseded by a proposal from 2020-02-24.
Description of the change
This shows the changes for the php-defaults update for initiating the transition to php7.4.
This merge is created using git ubuntu, however it's merging against Debian's unreleased git repository rather than debian/sid, so I'm not sure if the diff is going to generate properly.
Before this can land, php7.4 will need to finish migration, and be seeded into main. A spreadsheet with status of php dependencies is at:
PPA for testing:
https:/
Bug report for tracking purposes is at:
https:/
There was an error fetching revisions from git servers. Please try again in a few minutes. If the problem persists, contact Launchpad support.
Ok, so you branched off salsa at: 15378248352ea21 a41ad853ce
commit 5f1073c4b528b37
Author: Ondřej Surý <email address hidden>
Date: Wed Jan 22 13:25:59 2020 +0100
Update changelog for 72 release
You have some empty commits that I don't quite understand: 4a4132480326e92 1354db6f49
commit 5640be417e03cb4
Author: Bryce Harrington <email address hidden>
Date: Wed Feb 19 19:33:57 2020 +0000
* Transition supported PHP version to php7.3
commit 93611a1f7be8f56 cb618454aa5a0c5 8a02668aa0
Author: Bryce Harrington <email address hidden>
Date: Wed Feb 19 19:35:19 2020 +0000
* Revert default and supported PHP version to 7.2
Given debian released v73 of this package, would a normal git-ubuntu merge work now? And as a suggestion, you can always cherry-pick unreleased changes from salsa as added delta, no need to fuss around with branches to try to get git-ubuntu to work (if that's what happened).