Development:Unmerged files

Files with MOODLE_17_MERGED tag not updated - Fri Jan 18 00:17:05 CET 2008

RCS file: /cvsroot/moodle/install.php
 
RCS file: /cvsroot/moodle/grade/lib.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/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/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 - Fri Jan 11 01:12:33 CET 2008

RCS file: /cvsroot/moodle/admin/user.php
 
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/course/lib.php
< <?php  // $Id: lib.php,v 1.484.2.27 2007/10/05 07:19:29 nicolasconnault Exp $ 
> <?php  // $Id: lib.php,v 1.484.2.28 2007/12/28 15:56:21 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/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/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/lib.php
< <?php  // $Id: lib.php,v 1.63.2.2 2007/06/04 22:23:01 poltawski Exp $ 
> <?php  // $Id: lib.php,v 1.63.2.3 2007/12/27 21:25:19 mchurch Exp $ 
 
RCS file: /cvsroot/moodle/mod/wiki/mod_form.php
 
RCS file: /cvsroot/moodle/mod/wiki/ewiki/ewiki.php

Files with MOODLE_19_MERGED tag not updated - Fri Jan 11 01:12:16 CET 2008

RCS file: /cvsroot/moodle/admin/settings.php
< <?php // $Id: settings.php,v 1.40.2.2 2007/12/19 17:38:40 skodak Exp $ 
> <?php // $Id: settings.php,v 1.40.2.3 2007/12/23 11:52:59 skodak Exp $ 
 
RCS file: /cvsroot/moodle/course/lib.php
< <?php  // $Id: lib.php,v 1.538.2.12 2008/01/09 10:11:04 poltawski Exp $ 
> <?php  // $Id: lib.php,v 1.538.2.13 2008/01/10 15:43:21 jmg324 Exp $ 
 
RCS file: /cvsroot/moodle/course/modedit.php
< <?php // $Id: modedit.php,v 1.37 2008/01/08 06:07:56 nicolasconnault Exp $ 
> <?php // $Id: modedit.php,v 1.34.2.2 2007/11/19 07:10:48 moodler Exp $ 
 
RCS file: /cvsroot/moodle/lib/pagelib.php
< <?php //$Id: pagelib.php,v 1.62.2.5 2007/12/06 11:38:34 tjhunt Exp $ 
> <?php //$Id: pagelib.php,v 1.62.2.6 2007/12/27 21:32:04 mchurch Exp $ 
<  * @version  $Id: pagelib.php,v 1.62.2.5 2007/12/06 11:38:34 tjhunt Exp $ 
>  * @version  $Id: pagelib.php,v 1.62.2.6 2007/12/27 21:32:04 mchurch Exp $ 
 
RCS file: /cvsroot/moodle/mod/resource/lib.php
< <?php  // $Id: lib.php,v 1.70.2.5 2007/12/19 17:38:46 skodak Exp $ 
> <?php  // $Id: lib.php,v 1.70.2.6 2007/12/27 21:32:04 mchurch 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.