Development:Unmerged files

Files with MOODLE_17_MERGED tag not updated - Thu Dec 6 18:00:04 CET 2007

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 - Thu Dec 6 18:00:32 CET 2007

RCS file: /cvsroot/moodle/help.php
<  * @version $Id: help.php,v 1.38.2.2 2007/05/23 13:36:29 nfreear Exp $ 
>  * @version $Id: help.php,v 1.38.2.3 2007/11/06 13:38:34 nicolasconnault Exp $ 
 
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/info.php
< <?php // $Id: info.php,v 1.13.2.3 2007/03/05 05:38:46 moodler Exp $ 
> <?php // $Id: info.php,v 1.13.2.4 2007/11/20 02:36:53 mattc-catalyst 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/javascript-static.js
 
RCS file: /cvsroot/moodle/lib/moodlelib.php
 
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/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/wiki/mod_form.php
 
RCS file: /cvsroot/moodle/question/format.php
< <?php  // $Id: format.php,v 1.17.2.11 2007/09/17 10:59:32 thepurpleblob Exp $  
> <?php  // $Id: format.php,v 1.17.2.13 2007/11/15 14:04:22 mchurch Exp $  
 
RCS file: /cvsroot/moodle/search/indexer.php
 
RCS file: /cvsroot/moodle/search/documents/physical_doc.php
 
RCS file: /cvsroot/moodle/search/documents/physical_pdf.php
 
RCS file: /cvsroot/moodle/search/documents/resource_document.php
 
RCS file: /cvsroot/moodle/search/documents/techproject_document.php
 
RCS file: /cvsroot/moodle/userpix/index.php
< <?php // $Id: index.php,v 1.10 2007/12/02 22:19:53 iarenaza Exp $ 
> <?php // $Id: index.php,v 1.8 2007/01/08 20:38:03 skodak Exp $

Files with MOODLE_19_MERGED tag not updated - Thu Dec 6 18:03:21 CET 2007

RCS file: /cvsroot/moodle/admin/settings/grades.php
< <?php // $Id: grades.php,v 1.25 2007/12/06 14:24:48 nicolasconnault Exp $ 
> <?php // $Id: grades.php,v 1.14.2.10 2007/12/04 16:05:57 nicolasconnault Exp $ 
 
RCS file: /cvsroot/moodle/lang/en_utf8/grades.php
< <?PHP // $Id: grades.php,v 1.131 2007/12/05 09:35:19 nicolasconnault Exp $ 
> <?PHP // $Id: grades.php,v 1.111.2.19 2007/11/29 14:40:46 skodak Exp $ 
 
RCS file: /cvsroot/moodle/lib/db/upgradelib.php
< <?php  //$Id: upgradelib.php,v 1.11 2007/12/06 14:20:37 nicolasconnault Exp $ 
> <?php  //$Id: upgradelib.php,v 1.9.2.1 2007/10/11 11:12:55 nicolasconnault Exp $

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 MDL-8912: Progress in the Moodle Tracker about these unmerged files.