Development:Unmerged files

Files with MOODLE_17_MERGED tag not updated - Wed Feb 6 18:35:15 CET 2008

RCS file: /cvsroot/moodle/install.php
 
RCS file: /cvsroot/moodle/blocks/participants/block_participants.php
< <?PHP //$Id: block_participants.php,v 1.29 2006/09/20 20:31:46 skodak Exp $ 
> <?PHP //$Id: block_participants.php,v 1.29.2.2 2008/01/30 16:54:38 mchurch Exp $ 
 
RCS file: /cvsroot/moodle/grade/lib.php
 
RCS file: /cvsroot/moodle/install/lang/cs_utf8/installer.php
 
RCS file: /cvsroot/moodle/install/lang/sk_utf8/installer.php
 
RCS file: /cvsroot/moodle/lib/setuplib.php
< <?php // $Id: setuplib.php,v 1.9.2.4 2007/01/08 18:59:21 stronk7 Exp $  
> <?php // $Id: setuplib.php,v 1.9.2.5 2007/11/13 23:52:36 arborrow Exp $  
 
RCS file: /cvsroot/moodle/mod/resource/type/ims/finder.php
 
RCS file: /cvsroot/moodle/mod/wiki/ewiki/ewiki.php
 
RCS file: /cvsroot/moodle/mod/wiki/ewiki/plugins/init.php
 
RCS file: /cvsroot/moodle/mod/wiki/ewiki/plugins/spages.php

Files with MOODLE_18_MERGED tag not updated - Sun Feb 3 01:03:00 CET 2008

RCS file: /cvsroot/moodle/admin/mnet/peers.html
 
RCS file: /cvsroot/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.15 2007/11/01 06:13:19 donal72 Exp $ 
 
RCS file: /cvsroot/moodle/blocks/loancalc/block_loancalc.php
< <?php // $Id: block_loancalc.php,v 1.9 2007/01/10 06:44:15 vyshane Exp $ 
> <?php // $Id: block_loancalc.php,v 1.9.2.1 2007/10/22 20:29:45 arborrow Exp $ 
 
RCS file: /cvsroot/moodle/blocks/participants/block_participants.php
< <?PHP //$Id: block_participants.php,v 1.30.2.1 2007/03/05 20:09:57 skodak Exp $ 
> <?PHP //$Id: block_participants.php,v 1.30.2.2 2008/01/30 16:38:03 mchurch Exp $ 
 
RCS file: /cvsroot/moodle/enrol/mnet/config.html
 
RCS file: /cvsroot/moodle/enrol/mnet/enrol.php
 
RCS file: /cvsroot/moodle/enrol/paypal/enrol.php
< <?php  // $Id: enrol.php,v 1.26 2006/12/18 19:21:11 skodak Exp $ 
> <?php  // $Id: enrol.php,v 1.26.2.1 2007/11/13 18:02:28 mchurch Exp $ 
 
RCS file: /cvsroot/moodle/lang/en_utf8/enrol_mnet.php
 
RCS file: /cvsroot/moodle/lang/en_utf8/mnet.php
 
RCS file: /cvsroot/moodle/lib/pagelib.php
< <?php //$Id: pagelib.php,v 1.52.2.2 2007/09/12 10:46:07 skodak Exp $ 
> <?php //$Id: pagelib.php,v 1.52.2.3 2007/12/27 21:25:19 mchurch Exp $ 
<  * @version  $Id: pagelib.php,v 1.52.2.2 2007/09/12 10:46:07 skodak Exp $ 
>  * @version  $Id: pagelib.php,v 1.52.2.3 2007/12/27 21:25:19 mchurch Exp $ 
 
RCS file: /cvsroot/moodle/lib/pdflib.php
< <?php  // $Id: pdflib.php,v 1.4 2006/09/12 06:58:42 vyshane Exp $ 
> <?php  // $Id: pdflib.php,v 1.4.6.1 2008/01/28 05:25:49 moodler Exp $ 
 
RCS file: /cvsroot/moodle/mnet/testclient.php
> <?php // $Id: testclient.php,v 1.1.2.2 2007/10/19 00:45:56 donal72 Exp $ 
 
RCS file: /cvsroot/moodle/mnet/xmlrpc/client.php
 
RCS file: /cvsroot/moodle/mnet/xmlrpc/server.php
 
RCS file: /cvsroot/moodle/mnet/xmlrpc/xmlparser.php
 
RCS file: /cvsroot/moodle/mod/chat/lib.php
< <?php  // $Id: lib.php,v 1.99.2.5 2008/01/08 20:58:32 martinlanghoff Exp $ 
> <?php  // $Id: lib.php,v 1.93.2.1 2007/03/01 07:18:32 defacer Exp $ 
 
RCS file: /cvsroot/moodle/mod/choice/view.php
< <?php  // $Id: view.php,v 1.93.2.3 2007/08/22 20:03:46 skodak Exp $ 
> <?php  // $Id: view.php,v 1.93.2.4 2008/01/25 06:28:26 moodler Exp $ 
 
RCS file: /cvsroot/moodle/mod/data/lib.php
< <?php  // $Id: lib.php,v 1.113.2.7 2007/08/21 03:34:53 moodler Exp $ 
> <?php  // $Id: lib.php,v 1.113.2.8 2007/12/06 00:45:31 toyomoyo Exp $ 
 
RCS file: /cvsroot/moodle/mod/data/preset.php
< <?php // $Id: preset.php,v 1.20.2.3 2007/04/26 21:38:28 mjollnir_ Exp $ 
> <?php // $Id: preset.php,v 1.20.2.4 2007/12/06 00:45:32 toyomoyo Exp $ 
 
RCS file: /cvsroot/moodle/mod/lesson/locallib.php
< <?php // $Id: locallib.php,v 1.61.2.6 2007/10/13 02:24:56 mark-nielsen Exp $ 
> <?php // $Id: locallib.php,v 1.61.2.7 2007/12/30 19:07:23 mark-nielsen Exp $ 
<  * @version $Id: locallib.php,v 1.61.2.6 2007/10/13 02:24:56 mark-nielsen Exp $ 
>  * @version $Id: locallib.php,v 1.61.2.7 2007/12/30 19:07:23 mark-nielsen Exp $ 
 
RCS file: /cvsroot/moodle/mod/resource/type/file/resource.class.php
< <?php // $Id: resource.class.php,v 1.53.2.17 2007/11/05 14:10:38 nicolasconnault Exp $ 
> <?php // $Id: resource.class.php,v 1.53.2.18 2008/01/23 16:32:30 mchurch Exp $ 
 
RCS file: /cvsroot/moodle/mod/wiki/mod_form.php
 
RCS file: /cvsroot/moodle/mod/wiki/ewiki/ewiki.php
 
RCS file: /cvsroot/moodle/question/format/xml/format.php
< <?php // $Id: format.php,v 1.21.2.15 2007/10/30 17:52:43 tjhunt Exp $ 
> <?php // $Id: format.php,v 1.21.2.16 2008/01/15 14:58:10 thepurpleblob Exp $

Files with MOODLE_19_MERGED tag not updated - Sun Feb 3 01:03:06 CET 2008

RCS file: /cvsroot/moodle/auth/shibboleth/index.php
< <?php // $Id: index.php,v 1.16 2007/11/14 22:06:17 martinlanghoff Exp $ 
> <?php // $Id: index.php,v 1.15.2.1 2007/11/14 23:35:31 martinlanghoff Exp $ 
 
RCS file: /cvsroot/moodle/auth/shibboleth/login.php
< <?php // $Id: login.php,v 1.1 2008/02/01 08:30:17 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/blocks/participants/block_participants.php
< <?PHP //$Id: block_participants.php,v 1.33 2007/10/02 03:37:30 toyomoyo Exp $ 
> <?PHP //$Id: block_participants.php,v 1.33.2.1 2008/01/30 16:42:22 mchurch Exp $ 
 
RCS file: /cvsroot/moodle/lang/en_utf8/auth.php
< <?php // $Id: auth.php,v 1.38 2008/02/01 12:48:27 exe-cutor Exp $  
> <?php // $Id: auth.php,v 1.30.2.5 2008/02/01 08:34:08 exe-cutor Exp $  
 
RCS file: /cvsroot/moodle/mod/hotpot/lib.php
< <?PHP  // $Id: lib.php,v 1.79.2.5 2008/01/21 07:33:33 gbateson Exp $ 
> <?PHP  // $Id: lib.php,v 1.79.2.6 2008/01/27 23:55:29 gbateson Exp $ 
 
RCS file: /cvsroot/moodle/mod/hotpot/mod_form.php
 
RCS file: /cvsroot/moodle/mod/hotpot/report.php
< <?PHP  // $Id: report.php,v 1.38.2.3 2008/01/21 07:00:21 gbateson Exp $ 
> <?PHP  // $Id: report.php,v 1.38.2.4 2008/01/21 13:39:52 nicolasconnault Exp $

To generate this information yourself

Run the following commandline at the top level of your CVS sandbox:

cvs diff -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.