Development:Unmerged files

Files with MOODLE_18_MERGED tag not updated - Mon Oct 13 10:14:47 CEST 2008

RCS file: /cvsroot/moodle/lang/en_utf8/qtype_calculated.php
 
RCS file: /cvsroot/moodle/mnet/remote_client.php
 
RCS file: /cvsroot/moodle/search/documents/physical_pdf.php
 
RCS file: /cvsroot/moodle/search/documents/physical_xml.php

Files with MOODLE_19_MERGED tag not updated - Mon Oct 13 10:13:48 CEST 2008

RCS file: /cvsroot/moodle/index.php
< <?php  // $Id: index.php,v 1.201.2.5 2008/04/15 21:42:50 stronk7 Exp $ 
> <?php  // $Id: index.php,v 1.201.2.7 2008/09/19 06:22:43 nicolasconnault Exp $ 
 
RCS file: /cvsroot/moodle/course/edit_form.php
< <?php  //$Id: edit_form.php,v 1.37.2.9 2008/10/08 13:40:26 nicolasconnault Exp $ 
> <?php  //$Id: edit_form.php,v 1.37.2.10 2008/10/08 20:48:23 skodak Exp $ 
 
RCS file: /cvsroot/moodle/grade/report/user/lib.php
< <?php // $Id: lib.php,v 1.18.2.15 2008/10/08 10:56:10 nicolasconnault Exp $ 
> <?php // $Id: lib.php,v 1.18.2.16 2008/10/10 08:39:14 nicolasconnault Exp $ 
 
RCS file: /cvsroot/moodle/grade/report/user/settings.php
< <?php // $Id: settings.php,v 1.1.2.5 2008/10/08 10:56:10 nicolasconnault Exp $ 
> <?php // $Id: settings.php,v 1.1.2.6 2008/10/10 08:39:15 nicolasconnault Exp $ 
 
RCS file: /cvsroot/moodle/lang/en_utf8/moodle.php
 
RCS file: /cvsroot/moodle/lang/en_utf8/help/coursegrades.html
 
RCS file: /cvsroot/moodle/lang/en_utf8/help/grade/showrank.html
 
RCS file: /cvsroot/moodle/lib/filelib.php
< <?php //$Id: filelib.php,v 1.50.2.22 2008/10/09 06:20:17 scyrma Exp $ 
> <?php //$Id: filelib.php,v 1.50.2.23 2008/10/09 07:11:19 scyrma Exp $ 
 
RCS file: /cvsroot/moodle/lib/htmlpurifier/HTMLPurifier.php
 
RCS file: /cvsroot/moodle/lib/htmlpurifier/readme_moodle.txt
< $Id: readme_moodle.txt,v 1.4.2.3 2008/05/19 06:23:22 skodak Exp $ 
> $Id: readme_moodle.txt,v 1.4.2.4 2008/09/24 21:24:17 skodak Exp $ 
 
RCS file: /cvsroot/moodle/lib/pear/README.txt
 
RCS file: /cvsroot/moodle/lib/phpmailer/language/phpmailer.lang-ja.php
 
RCS file: /cvsroot/moodle/mnet/xmlrpc/client.php
 
RCS file: /cvsroot/moodle/mnet/xmlrpc/xmlparser.php
 
RCS file: /cvsroot/moodle/mod/lesson/action/delete.php
< <?php // $Id: delete.php,v 1.7 2006/09/30 19:49:41 mark-nielsen Exp $ 
> <?php // $Id: delete.php,v 1.7.8.1 2008/10/09 11:04:12 mudrd8mz Exp $ 
<  * @version $Id: delete.php,v 1.7 2006/09/30 19:49:41 mark-nielsen Exp $ 
>  * @version $Id: delete.php,v 1.7.8.1 2008/10/09 11:04:12 mudrd8mz Exp $ 
 
RCS file: /cvsroot/moodle/mod/resource/type/file/localpath.php
< <?php    // $Id: localpath.php,v 1.5.4.1 2007/12/14 21:21:07 skodak Exp $ 
> <?php    // $Id: localpath.php,v 1.5.4.2 2008/09/26 05:15:45 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/search/documents/physical_xml.php
 
RCS file: /cvsroot/moodle/tag/locallib.php
< <?php // $Id: locallib.php,v 1.1.2.17 2008/09/22 09:08:49 scyrma Exp $ 
> <?php // $Id: locallib.php,v 1.1.2.18 2008/09/24 08:04:01 scyrma Exp $ 
<  * @version: $Id: locallib.php,v 1.1.2.17 2008/09/22 09:08:49 scyrma Exp $ 
>  * @version: $Id: locallib.php,v 1.1.2.18 2008/09/24 08:04:01 scyrma Exp $

To generate this information yourself

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

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