Additional tasks: Difference between revisions
From Mahara Wiki
(Created page with "== 📋 Additional tasks ==") |
No edit summary |
||
| (4 intermediate revisions by the same user not shown) | |||
| Line 1: | Line 1: | ||
== 📋 Additional tasks == | == 📋 Additional tasks == | ||
=== Manage merge conflicts in version.php in backports=== | |||
When backporting patches, sometimes the <code>htdocs/lib/version.php</code> will get merge conflicts because of a new DB upgrade step. | |||
[[File:Example backporting from 22.04 to 21.10.png|654x654px]] | |||
Solve the conflict: | |||
#Keep the set of code that matches to the version you're working with, e.g. in this case, the top section. | |||
#Increment the <code>$config->version</code> number by 1. | |||
#Copy the incremented version number and replace the last step in <code>htdocs/lib/db/upgrade.php</code> | |||
#Check that the new number is higher than the previous upgrade step. | |||
In certain situations, $config->version number needs to be incremented and copied over the most latest DB upgrade steps, ensuring that it's later than the other DB upgrade steps. | |||
Latest revision as of 18:30, 6 Mayıs 2022
📋 Additional tasks
Manage merge conflicts in version.php in backports
When backporting patches, sometimes the htdocs/lib/version.php will get merge conflicts because of a new DB upgrade step.
Solve the conflict:
- Keep the set of code that matches to the version you're working with, e.g. in this case, the top section.
- Increment the
$config->versionnumber by 1. - Copy the incremented version number and replace the last step in
htdocs/lib/db/upgrade.php - Check that the new number is higher than the previous upgrade step.
In certain situations, $config->version number needs to be incremented and copied over the most latest DB upgrade steps, ensuring that it's later than the other DB upgrade steps.