Yay, nice Petr, thanks!

TO INTEGRATORS: This cannot be integrated before:

• The two blockers above are done: (MDL-30604 and) MDL-30605.
• The very first weeks of "sync" integration (22_STABLE & master) are running.

(so I'd say that this cool cleanup won't happen before Xmas)

The main moodle.git repository has just been updated with latest weekly modifications. You may wish to rebase your PULL branches to simplify history and avoid any possible merge conflicts. This would also make integrator's life easier next week.

TIA and ciao

rebased, env requirement in separate issue

The main moodle.git repository has just been updated with latest weekly modifications. You may wish to rebase your PULL branches to simplify history and avoid any possible merge conflicts. This would also make integrator's life easier next week.

TIA and ciao

rebased, ciao

Not sure about which criteria you've followed to, sometimes yes/no, delete/keep these lines:

// Moodle v2.2.0 release upgrade line

// Put any upgrade step following this

Nor why you've introduced these in main script:

////////////////////////////////////////

///upgrade supported only from 2.2.x ///

////////////////////////////////////////

But who cares, I don't. Ciao

Integrated, thanks!

I've added one commit bumping to 2012020200.00. So diverging has started, yay!

Ciao

Added one more commit adding one (unreachable) upgrade_main_savepoint() call (within 2011120500) to have all the upgrade blocks balanced and passing the automated CI checks.

thanks! the upgrade line inconsistence was introduced over the time when I was fixing merge conflicts...

Petr, please explain why I am testing upgrading from 1.9 to 2.1 for code that was only introduced/modified in 2.3 ...

The dev/integration version of 1.9 still allows me to upgrade to 2.1 the test instructions says it shouldn't ...

I'll pass this, based on the fact that the code does as it is supposed to, even if the test instructions include additional things that don't directly relate to the issue here

Side note, point 4 of testing instructions is, if I'm not wrong, one (wrong) leftover step, because the "dev" problem was fixed and tested by MDL-30605. So well done, Jason.

Ciao

The git and cvs repositories are happy receiving your very first contribution to Moodle for 2012. Happy new year!

Closing, ciao

This caused a fatal regression. The code in mod/workshop/form/accumulative/db/upgradelib.php that was deleted is used by restore from Moodle 1.9 code.

I will open a new issue.

Hi, this seems a bit drastic to drop all of this upgrade code. This complicates the upgrade path for those who are not yet on 2.2. Dropping 1.9 is fair enough but why drop 2.1 which came out less than a year ago? Given that there are two major releases per year now, and institutions will generally only have an opportunity to upgrade once per year, why not at least include the last 2 major versions so that a once-yearly upgrade is not complicated with having to create multiple code bases for the upgrade?