Development:Unmerged files: Difference between revisions
From MoodleDocs
Line 23: | Line 23: | ||
RCS file: [http://cvs.moodle.org/moodle/search/documents/physical_xml.php /cvsroot/moodle/search/documents/physical_xml.php] | RCS file: [http://cvs.moodle.org/moodle/search/documents/physical_xml.php /cvsroot/moodle/search/documents/physical_xml.php] | ||
==Files with MOODLE_19_MERGED tag not updated - | ==Files with MOODLE_19_MERGED tag not updated - Fri Dec 12 16:42:14 CET 2008 == | ||
RCS file: [http://cvs.moodle.org/moodle/version.php /cvsroot/moodle/version.php] | RCS file: [http://cvs.moodle.org/moodle/version.php /cvsroot/moodle/version.php] | ||
RCS file: [http://cvs.moodle.org/moodle/admin/ | RCS file: [http://cvs.moodle.org/moodle/admin/pagelib.php /cvsroot/moodle/admin/pagelib.php] | ||
< <?php // $Id: | < <?php // $Id: pagelib.php,v 1.23.2.2 2008/05/02 04:07:28 dongsheng Exp $ | ||
> <?php // $Id: | > <?php // $Id: pagelib.php,v 1.23.2.3 2008/12/11 09:21:53 tjhunt Exp $ | ||
RCS file: [http://cvs.moodle.org/moodle/admin/report/unittest/index.php /cvsroot/moodle/admin/report/unittest/index.php] | |||
< * @version $Id: index.php,v 1.4.2.2 2008/11/26 20:58:04 skodak Exp $ | |||
> * @version $Id: index.php,v 1.4.2.3 2008/12/11 09:21:53 tjhunt Exp $ | |||
RCS file: [http://cvs.moodle.org/moodle/admin/roles/allowassign.php /cvsroot/moodle/admin/roles/allowassign.php] | |||
RCS file: [http://cvs.moodle.org/moodle/admin/roles/allowoverride.php /cvsroot/moodle/admin/roles/allowoverride.php] | |||
RCS file: [http://cvs.moodle.org/moodle/admin/roles/assign.php /cvsroot/moodle/admin/roles/assign.php] | |||
< <?php // $Id: assign.php,v 1.63.2.14 2008/11/11 07:23:37 tjhunt Exp $ | |||
> <?php // $Id: assign.php,v 1.63.2.15 2008/12/11 09:21:52 tjhunt Exp $ | |||
RCS file: [http://cvs.moodle.org/moodle/admin/roles/manage.php /cvsroot/moodle/admin/roles/manage.php] | |||
< <?php //$Id: manage.php,v 1.52.2.4 2008/03/02 15:02:26 moodler Exp $ | |||
> <?php //$Id: manage.php,v 1.52.2.5 2008/12/11 09:21:52 tjhunt Exp $ | |||
RCS file: [http://cvs.moodle.org/moodle/admin/roles/override.php /cvsroot/moodle/admin/roles/override.php] | |||
< <?php //$Id: override.php,v 1.36.2.10 2008/07/23 16:09:14 skodak Exp $ | |||
> <?php //$Id: override.php,v 1.36.2.11 2008/12/11 09:21:52 tjhunt Exp $ | |||
RCS file: [http://cvs.moodle.org/moodle/admin/settings/server.php /cvsroot/moodle/admin/settings/server.php] | RCS file: [http://cvs.moodle.org/moodle/admin/settings/server.php /cvsroot/moodle/admin/settings/server.php] | ||
< <?php // $Id: server.php,v 1.26.2.21 2008/11/01 17:52:21 skodak Exp $ | < <?php // $Id: server.php,v 1.26.2.21 2008/11/01 17:52:21 skodak Exp $ | ||
> <?php // $Id: server.php,v 1.26.2.22 2008/12/06 17:45:30 skodak Exp $ | > <?php // $Id: server.php,v 1.26.2.22 2008/12/06 17:45:30 skodak Exp $ | ||
RCS file: [http://cvs.moodle.org/moodle/auth/shibboleth/index.php /cvsroot/moodle/auth/shibboleth/index.php] | RCS file: [http://cvs.moodle.org/moodle/auth/shibboleth/index.php /cvsroot/moodle/auth/shibboleth/index.php] | ||
< <?php // $Id: index.php,v 1. | < <?php // $Id: index.php,v 1.20 2008/12/08 10:49:44 exe-cutor Exp $ | ||
> <?php // $Id: index.php,v 1.15.2. | > <?php // $Id: index.php,v 1.15.2.4 2008/12/08 10:45:47 exe-cutor Exp $ | ||
RCS file: [http://cvs.moodle.org/moodle/auth/shibboleth/login.php /cvsroot/moodle/auth/shibboleth/login.php] | RCS file: [http://cvs.moodle.org/moodle/auth/shibboleth/login.php /cvsroot/moodle/auth/shibboleth/login.php] | ||
< <?php // $Id: login.php,v 1. | < <?php // $Id: login.php,v 1.5 2008/12/08 10:49:44 exe-cutor Exp $ | ||
> <?php // $Id: login.php,v 1.1.2.2 2008/02/01 12:58:08 exe-cutor Exp $ | > <?php // $Id: login.php,v 1.1.2.2 2008/02/01 12:58:08 exe-cutor Exp $ | ||
Line 48: | Line 66: | ||
< <?php // $Id: logout.php,v 1.2 2008/12/04 16:28:42 exe-cutor Exp $ | < <?php // $Id: logout.php,v 1.2 2008/12/04 16:28:42 exe-cutor Exp $ | ||
> <?php // $Id: logout.php,v 1.1.2.1 2008/12/04 16:27:00 exe-cutor Exp $ | > <?php // $Id: logout.php,v 1.1.2.1 2008/12/04 16:27:00 exe-cutor Exp $ | ||
RCS file: [http://cvs.moodle.org/moodle/course/category.php /cvsroot/moodle/course/category.php] | |||
< <?php // $Id: category.php,v 1.119.2.11 2008/12/05 08:57:07 tjhunt Exp $ | |||
> <?php // $Id: category.php,v 1.119.2.12 2008/12/11 09:21:53 tjhunt Exp $ | |||
RCS file: [http://cvs.moodle.org/moodle/course/import/activities/mod.php /cvsroot/moodle/course/import/activities/mod.php] | RCS file: [http://cvs.moodle.org/moodle/course/import/activities/mod.php /cvsroot/moodle/course/import/activities/mod.php] | ||
Line 64: | Line 86: | ||
< <?php //$Id: outcomeitem_form.php,v 1.12.2.13 2008/10/17 14:01:07 nicolasconnault Exp $ | < <?php //$Id: outcomeitem_form.php,v 1.12.2.13 2008/10/17 14:01:07 nicolasconnault Exp $ | ||
> <?php //$Id: outcomeitem_form.php,v 1.12.2.14 2008/10/22 09:09:32 nicolasconnault Exp $ | > <?php //$Id: outcomeitem_form.php,v 1.12.2.14 2008/10/22 09:09:32 nicolasconnault Exp $ | ||
RCS file: [http://cvs.moodle.org/moodle/lang/en_utf8/grades.php /cvsroot/moodle/lang/en_utf8/grades.php] | RCS file: [http://cvs.moodle.org/moodle/lang/en_utf8/grades.php /cvsroot/moodle/lang/en_utf8/grades.php] | ||
Line 71: | Line 91: | ||
> <?PHP // $Id: grades.php,v 1.111.2.59 2008/10/22 09:09:32 nicolasconnault Exp $ | > <?PHP // $Id: grades.php,v 1.111.2.59 2008/10/22 09:09:32 nicolasconnault Exp $ | ||
RCS file: [http://cvs.moodle.org/moodle/lib/ | RCS file: [http://cvs.moodle.org/moodle/lib/db/upgrade.php /cvsroot/moodle/lib/db/upgrade.php] | ||
RCS file: [http://cvs.moodle.org/moodle/question/type/shortanswer/questiontype.php /cvsroot/moodle/question/type/shortanswer/questiontype.php] | |||
< | < <?php // $Id: questiontype.php,v 1.20.2.8 2008/08/28 01:46:48 tjhunt Exp $ | ||
> <?php // $Id: questiontype.php,v 1.20.2.9 2008/12/12 03:48:33 tjhunt Exp $ | |||
RCS file: [http://cvs.moodle.org/moodle/question/type/shortanswer/simpletest/testquestiontype.php /cvsroot/moodle/question/type/shortanswer/simpletest/testquestiontype.php] | |||
==To generate this information yourself== | ==To generate this information yourself== |
Revision as of 15:43, 12 December 2008
Files with MOODLE_17_MERGED tag not updated - Sun Dec 7 20:06:12 CET 2008
RCS file: /cvsroot/moodle/user/view.php < <?PHP // $Id: view.php,v 1.123.2.10 2008/11/12 03:50:10 dongsheng Exp $ > <?PHP // $Id: view.php,v 1.123.2.11 2008/11/18 02:21:29 dongsheng Exp $
Files with MOODLE_18_MERGED tag not updated - Sun Dec 7 20:06:26 CET 2008
RCS file: /cvsroot/moodle/version.php RCS file: /cvsroot/moodle/admin/settings/security.php RCS file: /cvsroot/moodle/blocks/admin/block_admin.php < <?php //$Id: block_admin.php,v 1.84.2.4 2008/05/02 06:18:06 jerome Exp $ > <?php //$Id: block_admin.php,v 1.84.2.5 2008/11/28 06:27:39 ikawhero Exp $ RCS file: /cvsroot/moodle/lang/en_utf8/qtype_calculated.php RCS file: /cvsroot/moodle/mnet/remote_client.php RCS file: /cvsroot/moodle/search/documents/physical_pdf.php RCS file: /cvsroot/moodle/search/documents/physical_xml.php
Files with MOODLE_19_MERGED tag not updated - Fri Dec 12 16:42:14 CET 2008
RCS file: /cvsroot/moodle/version.php RCS file: /cvsroot/moodle/admin/pagelib.php < <?php // $Id: pagelib.php,v 1.23.2.2 2008/05/02 04:07:28 dongsheng Exp $ > <?php // $Id: pagelib.php,v 1.23.2.3 2008/12/11 09:21:53 tjhunt Exp $ RCS file: /cvsroot/moodle/admin/report/unittest/index.php < * @version $Id: index.php,v 1.4.2.2 2008/11/26 20:58:04 skodak Exp $ > * @version $Id: index.php,v 1.4.2.3 2008/12/11 09:21:53 tjhunt Exp $ RCS file: /cvsroot/moodle/admin/roles/allowassign.php RCS file: /cvsroot/moodle/admin/roles/allowoverride.php RCS file: /cvsroot/moodle/admin/roles/assign.php < <?php // $Id: assign.php,v 1.63.2.14 2008/11/11 07:23:37 tjhunt Exp $ > <?php // $Id: assign.php,v 1.63.2.15 2008/12/11 09:21:52 tjhunt Exp $ RCS file: /cvsroot/moodle/admin/roles/manage.php < <?php //$Id: manage.php,v 1.52.2.4 2008/03/02 15:02:26 moodler Exp $ > <?php //$Id: manage.php,v 1.52.2.5 2008/12/11 09:21:52 tjhunt Exp $ RCS file: /cvsroot/moodle/admin/roles/override.php < <?php //$Id: override.php,v 1.36.2.10 2008/07/23 16:09:14 skodak Exp $ > <?php //$Id: override.php,v 1.36.2.11 2008/12/11 09:21:52 tjhunt Exp $ RCS file: /cvsroot/moodle/admin/settings/server.php < <?php // $Id: server.php,v 1.26.2.21 2008/11/01 17:52:21 skodak Exp $ > <?php // $Id: server.php,v 1.26.2.22 2008/12/06 17:45:30 skodak Exp $ RCS file: /cvsroot/moodle/auth/shibboleth/index.php < <?php // $Id: index.php,v 1.20 2008/12/08 10:49:44 exe-cutor Exp $ > <?php // $Id: index.php,v 1.15.2.4 2008/12/08 10:45:47 exe-cutor Exp $ RCS file: /cvsroot/moodle/auth/shibboleth/login.php < <?php // $Id: login.php,v 1.5 2008/12/08 10:49:44 exe-cutor Exp $ > <?php // $Id: login.php,v 1.1.2.2 2008/02/01 12:58:08 exe-cutor Exp $ RCS file: /cvsroot/moodle/auth/shibboleth/logout.php < <?php // $Id: logout.php,v 1.2 2008/12/04 16:28:42 exe-cutor Exp $ > <?php // $Id: logout.php,v 1.1.2.1 2008/12/04 16:27:00 exe-cutor Exp $ RCS file: /cvsroot/moodle/course/category.php < <?php // $Id: category.php,v 1.119.2.11 2008/12/05 08:57:07 tjhunt Exp $ > <?php // $Id: category.php,v 1.119.2.12 2008/12/11 09:21:53 tjhunt Exp $ RCS file: /cvsroot/moodle/course/import/activities/mod.php < <?php // $Id: mod.php,v 1.9.2.1 2008/04/23 08:11:32 dongsheng Exp $ > <?php // $Id: mod.php,v 1.9.2.2 2008/12/03 16:31:01 samulik Exp $ RCS file: /cvsroot/moodle/filter/tex/texed.php < <?PHP // $Id: texed.php,v 1.7.2.1 2007/12/19 17:38:42 skodak Exp $ > <?PHP // $Id: texed.php,v 1.7.2.2 2008/11/11 18:35:42 mjollnir_ Exp $ RCS file: /cvsroot/moodle/grade/edit/outcome/edit_form.php < <?php //$Id: edit_form.php,v 1.5.2.2 2008/03/03 10:21:42 nicolasconnault Exp $ > <?php //$Id: edit_form.php,v 1.5.2.3 2008/10/22 09:09:32 nicolasconnault Exp $ RCS file: /cvsroot/moodle/grade/edit/tree/outcomeitem_form.php < <?php //$Id: outcomeitem_form.php,v 1.12.2.13 2008/10/17 14:01:07 nicolasconnault Exp $ > <?php //$Id: outcomeitem_form.php,v 1.12.2.14 2008/10/22 09:09:32 nicolasconnault Exp $ RCS file: /cvsroot/moodle/lang/en_utf8/grades.php < <?PHP // $Id: grades.php,v 1.111.2.58 2008/10/17 14:32:44 nicolasconnault Exp $ > <?PHP // $Id: grades.php,v 1.111.2.59 2008/10/22 09:09:32 nicolasconnault Exp $ RCS file: /cvsroot/moodle/lib/db/upgrade.php RCS file: /cvsroot/moodle/question/type/shortanswer/questiontype.php < <?php // $Id: questiontype.php,v 1.20.2.8 2008/08/28 01:46:48 tjhunt Exp $ > <?php // $Id: questiontype.php,v 1.20.2.9 2008/12/12 03:48:33 tjhunt Exp $ RCS file: /cvsroot/moodle/question/type/shortanswer/simpletest/testquestiontype.php
To generate this information yourself
Run the following commandline at the top level of your CVS sandbox:
cvs diff -kkv -r MOODLE_19_MERGED -r MOODLE_19_STABLE | egrep '^(RCS|[<>] <\?[Pp][Hh][Pp] *\/\/ *\$Id)' > unmergedfiles.txt; cat unmergedfiles.txt
Some useful links
- Moodle CVS for developers: explains how to work with the Moodle code in CVS.
- Review Unmerged files, please... discussion from moodle.org forums.
- Tracker Task MDL-8912: Progress in the Moodle Tracker about these unmerged files.