Hello Moodle programmers,
I am trying to submit a patch for Moodle core on the Moodle tracker, and CiBoT has told me to "rebase against current master" and I don't know what to do. Can you help?
The issue I have created is MDL-49758.
CiBoT has given me the following message:
Error: The MDL-49758-quiz-locallib-completion_info branch at
https://github.com/gbateson/moodle is very old (>60 days ago).
Please rebase against current master.
It is a mysterious message for me, because from my point of view that branch is not old, it is new - just three days old in fact. I created it from the Moodle master branch which I maintain on my repository at github.com. This repository was setup, and is regularly updated, according to the Moodle Docs instructions in "GIT for developers". i.e.
##
git clone git://github.com/gbateson/moodle.git MOODLEDIR
cd MOODLEDIR
git remote add upstream git://git.moodle.org/moodle.git
## UPDATE
##
cd MOODLEDIR
git fetch upstream
for BRANCH in MOODLE_{19..29}_STABLE master; do
git push origin refs/remotes/upstream/$BRANCH:$BRANCH
done
The patch was created as follows:
##
git clone git://github.com/gbateson/moodle.git PATCHDIR
cd PATCHDIR
git checkout -b PATCHBRANCH origin/master
git branch
vi mod/quiz/locallib.php
git commit -a -m "MDL-49758 include lib/completionlib.php in mod/quiz/locallib.php"
git push PATCHBRANCH
If I go into the PATCHDIR and try "git rebase master PATCHBRANCH" the git tells me "Patch failed at 0001 MDL-33606 course" and invites me to amend or skip this problem. If I skip 0001, then git stops for 0002. It looks to me as though git wants me to manually approve every commit there has ever been on Moodle (?!) but probably, I have misunderstood what is going on.
If anyone can see how I should rebase, I would be very glad to hear from them.
regards
Gordon