Uploaded image for project: 'Moodle'
  1. Moodle
  2. MDL-31666

moodle.git does not contain all CVS commits, stable branches and and tags

    Details

    • Type: Bug
    • Status: Closed
    • Priority: Minor
    • Resolution: Fixed
    • Affects Version/s: 2.3
    • Fix Version/s: 2.3
    • Component/s: Administration
    • Labels:
    • Testing Instructions:
      Hide

      1. Make sure that the repository contains new MOODLE_13_STABLE, MOODLE_14_STABLE and MOODLE_15_STABLE branches
      2. Make sure that the repository contains tags for all historical Moodle releases described at http://docs.moodle.org/dev/Releases (note that the tag date may be different from the one at the page)
      3 Let Git show each of these new tags and make sure that:
      3.1 The tag name has the form vX.Y.Z
      3.2 The tag message has the form MOODLE_XY or MOODLE_XYZ
      3.3 The tag date is the same as the tagged commit's date (it was important to set these dates into the past so versions appear at correct chronological order at the web)
      3.4 The tag actually tags a reasonable commit (I generally chose commits that modify the $release variable in version.php unless there was a good reason to break this rule)

      You can find the following Linux command useful when testing the point 3:

      1. for TAG in $(git tag -l | grep v1.[0-8].) ; do git show $TAG; done
      Show
      1. Make sure that the repository contains new MOODLE_13_STABLE, MOODLE_14_STABLE and MOODLE_15_STABLE branches 2. Make sure that the repository contains tags for all historical Moodle releases described at http://docs.moodle.org/dev/Releases (note that the tag date may be different from the one at the page) 3 Let Git show each of these new tags and make sure that: 3.1 The tag name has the form vX.Y.Z 3.2 The tag message has the form MOODLE_XY or MOODLE_XYZ 3.3 The tag date is the same as the tagged commit's date (it was important to set these dates into the past so versions appear at correct chronological order at the web) 3.4 The tag actually tags a reasonable commit (I generally chose commits that modify the $release variable in version.php unless there was a good reason to break this rule) You can find the following Linux command useful when testing the point 3: for TAG in $(git tag -l | grep v1. [0-8] .) ; do git show $TAG; done
    • Affected Branches:
      MOODLE_23_STABLE
    • Fixed Branches:
      MOODLE_23_STABLE
    • Pull from Repository:

      Description

      While working on the new local_dev plugin, I realized that the current moodle.git does not contain all commits from CVS. The reason for this was that we kept just refs/heads/MOODLE_16_STABLE and higher. So all commits that led to MOODLE_13_STABLE, MOODLE_14_STABLE and MOODLE_15_STABLE were pruned by Git garbage collector. Therefore there was no way to re-tag legacy releases (which is what I need for local_dev).

      Luckily there is still Catalyst's moodle-r2.git available so I was able to fetch missing commits and add them to my clone of moodle.git. I think it would be nice to have upstream moodle.git complete so I'm submitting this to upstream.

      To get missing branches, commits and tags to integration.git, integrators may want to do something like this:

      1. git fetch --tags git://github.com/mudrd8mz/moodle.git MOODLE_13_STABLE:MOODLE_13_STABLE
      2. git fetch --tags git://github.com/mudrd8mz/moodle.git MOODLE_14_STABLE:MOODLE_14_STABLE
      3. git fetch --tags git://github.com/mudrd8mz/moodle.git MOODLE_15_STABLE:MOODLE_15_STABLE

      When testing passes, just push the new branches and tags to moodle.git

      See the testing instructions for how I think this could be double-checked.

        Gliffy Diagrams

          Issue Links

            Activity

            Hide
            mudrd8mz David Mudrak added a comment -

            See the description for describing the unusual way of integrating this.

            Show
            mudrd8mz David Mudrak added a comment - See the description for describing the unusual way of integrating this.
            Hide
            stronk7 Eloy Lafuente (stronk7) added a comment -

            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

            Show
            stronk7 Eloy Lafuente (stronk7) added a comment - 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
            Hide
            stronk7 Eloy Lafuente (stronk7) added a comment -

            And this has been sent to integration.git after verifying all the tags, trailing commits and comparing with real CVS status.

            Will be rolled upstream next Thursday. Many thanks, David!

            Show
            stronk7 Eloy Lafuente (stronk7) added a comment - And this has been sent to integration.git after verifying all the tags, trailing commits and comparing with real CVS status. Will be rolled upstream next Thursday. Many thanks, David!
            Hide
            stronk7 Eloy Lafuente (stronk7) added a comment -

            Some changes to Moodle should be milestones in the project by themselves.

            This is not the case and your fix is not so important, but your collaboration is highly appreciated, thanks!

            Closing as fixed, ciao

            Show
            stronk7 Eloy Lafuente (stronk7) added a comment - Some changes to Moodle should be milestones in the project by themselves. This is not the case and your fix is not so important, but your collaboration is highly appreciated, thanks! Closing as fixed, ciao

              People

              • Votes:
                0 Vote for this issue
                Watchers:
                1 Start watching this issue

                Dates

                • Created:
                  Updated:
                  Resolved:
                  Fix Release Date:
                  25/Jun/12