Ciao
hmmm - this one seems to be mine, but I've tried a merge, & it says everything looks fine! - do I need to commit the file in again after the merge - even though there is no change?
RCS file: /cvsroot/moodle/moodle/mod/choice/view.php,v
< <?PHP // $Id: view.php,v 1.34.2.1 2005/02/25 14:20:27 moodler Exp $
> <?PHP // $Id: view.php,v 1.34.2.2 2005/04/03 23:39:05 danmarsden Exp $
MOODLE_14_STABLE only gets bug fixes (no new features) and those should always be merged to the HEAD/trunk. There should very rarely be a need to merge the other way.
Secondly, after merging a bug fix from the MOODLE_14_STABLE branch to HEAD/trunk, by doing this (in a HEAD checkout):
cvs -q update -kk -j MOODLE_14_MERGED -j MOODLE_14_STABLE [files...]
you need to move the MOODLE_14_MERGED tag for those files on the STABLE branch as follows (in a STABLE checkout):
cvs tag -F MOODLE_14_MERGED [files...]
The full process is described in our CVS documentation ...
Secondly, after merging a bug fix from the MOODLE_14_STABLE branch to HEAD/trunk, by doing this (in a HEAD checkout):
cvs -q update -kk -j MOODLE_14_MERGED -j MOODLE_14_STABLE [files...]
you need to move the MOODLE_14_MERGED tag for those files on the STABLE branch as follows (in a STABLE checkout):
cvs tag -F MOODLE_14_MERGED [files...]
The full process is described in our CVS documentation ...