Development:Unmerged files
From MoodleDocs
Files with MOODLE_17_MERGED tag not updated - Thu Oct 18 18:40:02 CEST 2007
RCS file: /cvsroot/moodle/moodle/admin/delete.php < <?PHP //$Id: delete.php,v 1.12 2006/09/25 20:22:56 skodak Exp $ > <?PHP //$Id: delete.php,v 1.12.2.1 2007/10/15 05:53:22 nicolasconnault Exp $ RCS file: /cvsroot/moodle/moodle/backup/lib.php RCS file: /cvsroot/moodle/moodle/backup/bb/restore_bb.php < <?php // $Id: restore_bb.php,v 1.7 2006/03/07 23:41:22 skodak Exp $ > <?php // $Id: restore_bb.php,v 1.7.8.1 2007/10/15 05:53:22 nicolasconnault Exp $ RCS file: /cvsroot/moodle/moodle/mod/assignment/db/postgres7.php < <?php // $Id: postgres7.php,v 1.22.2.1 2006/10/26 22:29:55 stronk7 Exp $ > <?php // $Id: postgres7.php,v 1.22.2.2 2007/10/15 05:53:21 nicolasconnault Exp $ RCS file: /cvsroot/moodle/moodle/mod/hotpot/lib.php < <?PHP // $Id: lib.php,v 1.57.2.8 2007/09/30 04:18:18 gbateson Exp $ > <?PHP // $Id: lib.php,v 1.57.2.9 2007/10/15 05:53:21 nicolasconnault Exp $ RCS file: /cvsroot/moodle/moodle/mod/resource/type/ims/finder.php RCS file: /cvsroot/moodle/moodle/mod/resource/type/ims/repository_deploy.php < <?php // $Id: repository_deploy.php,v 1.5 2006/09/20 15:04:01 skodak Exp $ > <?php // $Id: repository_deploy.php,v 1.5.2.1 2007/10/15 05:53:20 nicolasconnault Exp $ RCS file: /cvsroot/moodle/moodle/mod/wiki/ewiki/ewiki.php RCS file: /cvsroot/moodle/moodle/mod/wiki/ewiki/plugins/init.php RCS file: /cvsroot/moodle/moodle/mod/wiki/ewiki/plugins/spages.php RCS file: /cvsroot/moodle/moodle/question/format/blackboard_6/format.php RCS file: /cvsroot/moodle/moodle/question/format/coursetestmanager/format.php < <?php // $Id: format.php,v 1.6 2006/04/10 22:10:34 gustav_delius Exp $ > <?php // $Id: format.php,v 1.6.8.1 2007/10/15 05:53:21 nicolasconnault Exp $
Files with MOODLE_18_MERGED tag not updated - Thu Oct 18 18:40:19 CEST 2007
RCS file: /cvsroot/moodle/moodle/admin/delete.php RCS file: /cvsroot/moodle/moodle/admin/mnet/peers.html RCS file: /cvsroot/moodle/moodle/auth/mnet/auth.php < <?php // $Id: auth.php,v 1.14.2.13 2007/10/11 13:19:53 nicolasconnault Exp $ > <?php // $Id: auth.php,v 1.14.2.14 2007/10/16 08:50:41 donal72 Exp $ RCS file: /cvsroot/moodle/moodle/backup/lib.php < <?php //$Id: lib.php,v 1.78.2.4 2007/10/12 20:26:48 nicolasconnault Exp $ > <?php //$Id: lib.php,v 1.78.2.5 2007/10/15 05:42:40 nicolasconnault Exp $ RCS file: /cvsroot/moodle/moodle/backup/bb/restore_bb.php < <?php // $Id: restore_bb.php,v 1.7 2006/03/07 23:41:22 skodak Exp $ > <?php // $Id: restore_bb.php,v 1.7.12.1 2007/10/15 05:42:42 nicolasconnault Exp $ RCS file: /cvsroot/moodle/moodle/enrol/mnet/config.html RCS file: /cvsroot/moodle/moodle/lang/en_utf8/enrol_mnet.php RCS file: /cvsroot/moodle/moodle/lang/en_utf8/mnet.php RCS file: /cvsroot/moodle/moodle/mnet/testclient.php > <?php // $Id: testclient.php,v 1.1.2.1 2007/10/17 08:11:29 donal72 Exp $ RCS file: /cvsroot/moodle/moodle/mnet/xmlrpc/client.php RCS file: /cvsroot/moodle/moodle/mnet/xmlrpc/server.php RCS file: /cvsroot/moodle/moodle/mnet/xmlrpc/xmlparser.php RCS file: /cvsroot/moodle/moodle/mod/assignment/db/mysql.php < <?php // $Id: mysql.php,v 1.25 2006/10/26 22:39:12 stronk7 Exp $ > <?php // $Id: mysql.php,v 1.25.4.1 2007/10/15 05:42:37 nicolasconnault Exp $ RCS file: /cvsroot/moodle/moodle/mod/assignment/db/postgres7.php < <?php // $Id: postgres7.php,v 1.23 2006/10/26 22:46:06 stronk7 Exp $ > <?php // $Id: postgres7.php,v 1.23.4.1 2007/10/15 05:42:36 nicolasconnault Exp $ RCS file: /cvsroot/moodle/moodle/mod/hotpot/lib.php < <?PHP // $Id: lib.php,v 1.66.2.12 2007/10/04 05:11:07 gbateson Exp $ > <?PHP // $Id: lib.php,v 1.66.2.13 2007/10/15 05:42:42 nicolasconnault Exp $ RCS file: /cvsroot/moodle/moodle/mod/resource/type/ims/finder.php RCS file: /cvsroot/moodle/moodle/mod/resource/type/ims/repository_deploy.php < <?php // $Id: repository_deploy.php,v 1.6 2007/01/04 23:38:19 skodak Exp $ > <?php // $Id: repository_deploy.php,v 1.6.2.1 2007/10/15 05:42:36 nicolasconnault Exp $ RCS file: /cvsroot/moodle/moodle/mod/wiki/ewiki/ewiki.php RCS file: /cvsroot/moodle/moodle/mod/wiki/ewiki/plugins/init.php RCS file: /cvsroot/moodle/moodle/mod/wiki/ewiki/plugins/spages.php RCS file: /cvsroot/moodle/moodle/question/format/blackboard_6/format.php RCS file: /cvsroot/moodle/moodle/question/format/coursetestmanager/format.php < <?php // $Id: format.php,v 1.7.2.2 2007/03/02 01:58:20 toyomoyo Exp $ > <?php // $Id: format.php,v 1.7.2.3 2007/10/15 05:42:38 nicolasconnault Exp $
Files with MOODLE_19_MERGED tag not updated - Sun Oct 14 18:34:13 CEST 2007
RCS file: /cvsroot/moodle/moodle/lib/weblib.php < <?php // $Id: weblib.php,v 1.970.2.5 2007/10/12 10:35:55 tjhunt Exp $ > <?php // $Id: weblib.php,v 1.970.2.6 2007/10/12 15:11:39 tjhunt Exp $ < * @version $Id: weblib.php,v 1.970.2.5 2007/10/12 10:35:55 tjhunt Exp $ > * @version $Id: weblib.php,v 1.970.2.6 2007/10/12 15:11:39 tjhunt Exp $ RCS file: /cvsroot/moodle/moodle/theme/custom_corners/footer.html RCS file: /cvsroot/moodle/moodle/theme/custom_corners/meta.php RCS file: /cvsroot/moodle/moodle/theme/custom_corners/styles_ie6.css RCS file: /cvsroot/moodle/moodle/theme/custom_corners/user_styles.css RCS file: /cvsroot/moodle/moodle/theme/custom_corners/js/jquery.php
To generate this information yourself
Run the following commandline at the top level of your CVS sandbox:
cvs diff -r MOODLE_18_MERGED -r MOODLE_18_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 [https://tracker.moodle.org/browse/MDL-8912 MDL-8912]: Progress in the Moodle Tracker about these unmerged files.
