HEADS UP: MOODLE_20_STABLE branch created in git

HEADS UP: MOODLE_20_STABLE branch created in git

by Martin Dougiamas -
Number of replies: 10
Picture of Core developers Picture of Documentation writers Picture of Moodle HQ Picture of Particularly helpful Moodlers Picture of Plugin developers Picture of Testers

We have just branched MOODLE_20_STABLE in git.

Since the 2.0 release last November, we at Moodle HQ only been working on the stable 2.0.x series, so it was a lot easier to stay on the master (HEAD in the old terminology) to reduce the amount of work needed to get new code into git.  However, we are now starting work on 2.1 features, so the 2.0.x branch has been split away (at the end of last week).

For the next week or so at least the two branches will remain the same, so you have some time to deal with this, but if you are using git (or CVS for that matter) to maintain your stable sites, then you should make sure they are updating from the MOODLE_20_STABLE branch.

Even if you do accidentally update from the master/HEAD unstable version in future, a new feature in Moodle 2 (thanks David!) will actually warn you that you are about to upgrade to an unstable version and give you a chance to fix the problem.

 

Finally, what this means for developers is of course that you need to file three separate pull requests for most patches:

  • 2.1 (master)
  • 2.0.x (MOODLE_20_STABLE)
  • 1.9.x (MOODLE_19_STABLE)   (if applicable)

I'm still working on simplifying this process in the tracker.

Average of ratings:Useful (1)
In reply to Martin Dougiamas

Re: HEADS UP: MOODLE_20_STABLE branch created in git

by Andrea Bicciolo -

Thanks for the info Martin smile

I'm supposing the MOODLE_20_WEEKLY tag will continue to exists and working like previous releases, such as MOODLE_19_WEEKLY. I'm supposing correctly ?

Branches MOODLE_20_STABLE and _WEEKLY will be mirrored from git to CVS ?

Average of ratings: -
In reply to Andrea Bicciolo

Re: HEADS UP: MOODLE_20_STABLE branch created in git

by David Mudrák -
Picture of Core developers Picture of Documentation writers Picture of Moodle HQ Picture of Particularly helpful Moodlers Picture of Peer reviewers Picture of Plugin developers Picture of Plugins guardians Picture of Testers Picture of Translators

Andrea, WEEKLY tags have never existed in the new Git repository. Because of the new pull-based model, all branches at moodle.git grow once a week only after the testing period.

So for example MOODLE_20_STABLE at moodle.git repository effectively behave the same as MOODLE_20_WEEKLY would in previous CVS world. And because the current CVS is just a mirror of moodle.git, there is no point of having that tag there, too.

In other worlds, MOODLE_20_WEEKLY would always be the same as MOODLE_20_STABLE because there is no new code added continuously there as it used to be.

Average of ratings: -
In reply to David Mudrák

Re: HEADS UP: MOODLE_20_STABLE branch created in git

by Andrea Bicciolo -

Thanks David. Curerntly in CVS (not git) there is MOODLE_20_WEEKLY, thus it should be a mirror of MOODLE_20_STABLE from moodle git repo.

Average of ratings: -
In reply to Andrea Bicciolo

Re: HEADS UP: MOODLE_20_STABLE branch created in git

by Eloy Lafuente (stronk7) -
Picture of Core developers Picture of Documentation writers Picture of Moodle HQ Picture of Particularly helpful Moodlers Picture of Peer reviewers Picture of Plugin developers Picture of Testers

Yes, there are:

So people using CVS for keeping their sites updated... can continue using it as was in previous versions (WEEKLY) no matter both are always pointing to the same revisions or no.

In the other side, I'd recommend admins to start switching their update / sync scripts from cvs to git.

Without any disquisition about the TTL of the CVS sync, the truth is incontestable: CVS is dead. Simple.

Developers already know that and have adapted their workflows to git. Administrators should start doing that ASAP.

Ciao smile

PS: Note the MOODLE_20_STABLE branch has been created a few hours ago, it didn't exist when Andrea posted his message above, hehe. Tomorrow it will receive its first sync (from git, of course).

Average of ratings:Useful (1)
In reply to Eloy Lafuente (stronk7)

Re: HEADS UP: MOODLE_20_STABLE branch created in git

by Ryan Smith -

I would love to switch from CVS to GIT, but there isn't any documentation on GIT for administrators on the Moodle Docs upgrading pages:

http://docs.moodle.org/en/Upgrading
and
http://docs.moodle.org/en/CVS_for_Administrators

The CVS instructions are fantastic, it would be nice to have good detailed GIT instructions for all platforms.

Average of ratings: -
In reply to Ryan Smith

Re: HEADS UP: MOODLE_20_STABLE branch created in git

by Tim Hunt -
Picture of Core developers Picture of Documentation writers Picture of Particularly helpful Moodlers Picture of Peer reviewers Picture of Plugin developers

Git_for_Administrators already exists.

Average of ratings: -
In reply to Tim Hunt

Re: HEADS UP: MOODLE_20_STABLE branch created in git

by Ryan Smith -

Yes, it exists, but it isn't linked on the upgrading page:

http://docs.moodle.org/en/Upgrading

and, the GIT instructions are FAR inferior to the CVS instructions:

http://docs.moodle.org/en/Git_for_Administrators

vs

http://docs.moodle.org/en/CVS_for_Administrators

Average of ratings: -
In reply to Ryan Smith

Re: HEADS UP: MOODLE_20_STABLE branch created in git

by Eloy Lafuente (stronk7) -
Picture of Core developers Picture of Documentation writers Picture of Moodle HQ Picture of Particularly helpful Moodlers Picture of Peer reviewers Picture of Plugin developers Picture of Testers

Ho Ryan,

we have been talking exactly about those 2 pages some hours ago, and there are some ongoing processes in order to get them completed / useful. So I hope they will satisfy your needs soon. Yes

Of course, it's a wiki, so anybody is welcome to contribute! wink

Ciao smile

Average of ratings: -
In reply to Eloy Lafuente (stronk7)

Re: HEADS UP: MOODLE_20_STABLE branch created in git

by Ryan Smith -

Thanks Eloy! I'll be glad to test out the instructions and provide feedback.

Average of ratings: -