Development:Unmerged files

Files with MOODLE_17_MERGED tag not updated - Wed Oct 31 20:42:14 CET 2007

RCS file: /cvsroot/moodle/moodle/mod/resource/type/ims/finder.php
 
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

Files with MOODLE_18_MERGED tag not updated - Wed Oct 31 20:42:15 CET 2007

RCS file: /cvsroot/moodle/moodle/admin/blocks.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/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/moodle/course/search.php
< <?php // $Id: search.php,v 1.35.2.9 2007/03/02 01:24:47 nicolasconnault Exp $ 
> <?php // $Id: search.php,v 1.35.2.11 2007/10/19 07:52:17 toyomoyo 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/lib/filelib.php
< <?php //$Id: filelib.php,v 1.39.2.6 2007/08/23 06:42:24 moodler Exp $ 
> <?php //$Id: filelib.php,v 1.39.2.10 2007/10/30 00:32:27 toyomoyo Exp $ 
 
RCS file: /cvsroot/moodle/moodle/lib/javascript-static.js
 
RCS file: /cvsroot/moodle/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/moodle/mnet/xmlrpc/client.php
 
RCS file: /cvsroot/moodle/moodle/mnet/xmlrpc/server.php
 
RCS file: /cvsroot/moodle/moodle/mnet/xmlrpc/xmlparser.php

Files with MOODLE_19_MERGED tag not updated - Wed Oct 31 20:45:00 CET 2007

RCS file: /cvsroot/moodle/moodle/admin/mnet/peers.html
 
RCS file: /cvsroot/moodle/moodle/auth/mnet/auth.php
 
RCS file: /cvsroot/moodle/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.4.1 2007/10/22 20:37:53 arborrow Exp $ 
 
RCS file: /cvsroot/moodle/moodle/enrol/imsenterprise/enrol.php
 
RCS file: /cvsroot/moodle/moodle/enrol/mnet/config.html
 
RCS file: /cvsroot/moodle/moodle/group/autogroup.php
< <?php // $Id: autogroup.php,v 1.1 2007/09/24 21:55:15 mattc-catalyst Exp $ 
> <?php // $Id: autogroup.php,v 1.1.2.1 2007/10/18 03:00:23 mattc-catalyst Exp $ 
   
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/enrol_mnet.php
 
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/group.php
 
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/mnet.php
 
RCS file: /cvsroot/moodle/moodle/lib/javascript-static.js
 
RCS file: /cvsroot/moodle/moodle/mnet/testclient.php
< <?php // $Id: testclient.php,v 1.2 2007/08/29 10:48:47 stronk7 Exp $ 
> <?php // $Id: testclient.php,v 1.2.2.2 2007/10/19 00:44:40 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/chat/lib.php
< <?php  // $Id: lib.php,v 1.99.2.1 2007/10/17 07:18:14 toyomoyo Exp $ 
> <?php  // $Id: lib.php,v 1.99.2.2 2007/10/17 07:28:44 toyomoyo Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/forum/lib.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.