And is this the right sort of procedure:
- Do the bug fix in my 1.6 branch sandbox.
- Test the fix.
- Check the fix in.
- Use CVS to merge that change into my HEAD sandbox.
- Then I check that in.
I am a bit of a newbie when it comes to working on a CVS branch. Is it my responsibility for merging my changes from the branch to head?
And is this the right sort of procedure:
And is this the right sort of procedure:
Tim,
Yes it is your responsibility. You will find specific instructions in the developers area in the docs wiki - you need to follow these to the letter (although for extra safety you can type just the name of the file(s) you are working with on the end of all the commands).
I say this because I found out the hard way (
) that working on the stable branch is much higher risk - even more so when we come out of beta. The stakes are a whole lot higher!
branches docs....
http://docs.moodle.org/en/CVS_%28developer%29#Stable_branches_for_each_release
Yes it is your responsibility. You will find specific instructions in the developers area in the docs wiki - you need to follow these to the letter (although for extra safety you can type just the name of the file(s) you are working with on the end of all the commands).
I say this because I found out the hard way (
branches docs....
http://docs.moodle.org/en/CVS_%28developer%29#Stable_branches_for_each_release
Also, it could be a good idea to watch periodically this page to see the status of the _MERGED tag and check and solve remaining entries: http://docs.moodle.org/en/Unmerged_files
Ciao
Ciao