Development:Unmerged files

Files with MOODLE_17_MERGED tag not updated - Wed Oct 1 11:26:20 CEST 2008

RCS file: /cvsroot/moodle/question/type/questiontype.php
< <?php  // $Id: questiontype.php,v 1.31.2.9 2008/01/30 18:18:40 tjhunt Exp $ 
> <?php  // $Id: questiontype.php,v 1.31.2.10 2008/09/28 08:59:57 tjhunt Exp $ 
< * @version $Id: questiontype.php,v 1.31.2.9 2008/01/30 18:18:40 tjhunt Exp $ 
> * @version $Id: questiontype.php,v 1.31.2.10 2008/09/28 08:59:57 tjhunt Exp $

Files with MOODLE_18_MERGED tag not updated - Wed Oct 1 11:25:18 CEST 2008

RCS file: /cvsroot/moodle/lang/en_utf8/qtype_calculated.php
 
RCS file: /cvsroot/moodle/mnet/remote_client.php
 
RCS file: /cvsroot/moodle/question/type/questiontype.php
< <?php  // $Id: questiontype.php,v 1.43.2.17 2008/08/20 09:46:10 tjhunt Exp $ 
> <?php  // $Id: questiontype.php,v 1.43.2.18 2008/09/28 08:59:43 tjhunt Exp $ 
< * @version $Id: questiontype.php,v 1.43.2.17 2008/08/20 09:46:10 tjhunt Exp $ 
> * @version $Id: questiontype.php,v 1.43.2.18 2008/09/28 08:59:43 tjhunt Exp $ 
 
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 - Wed Oct 1 11:26:08 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/admin/settings/server.php
< <?php // $Id: server.php,v 1.26.2.18 2008/09/18 08:16:02 scyrma Exp $ 
> <?php // $Id: server.php,v 1.26.2.19 2008/09/23 05:18:04 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/lib/moodlelib.php
 
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/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/chat/report.php
< <?php  // $Id: report.php,v 1.37.2.2 2008/02/13 17:01:41 skodak Exp $ 
> <?php  // $Id: report.php,v 1.37.2.3 2008/08/27 02:17:37 dongsheng Exp $ 
 
RCS file: /cvsroot/moodle/mod/quiz/edit.php
< <?php // $Id: edit.php,v 1.107.2.10 2008/04/23 14:49:24 tjhunt Exp $ 
> <?php // $Id: edit.php,v 1.107.2.11 2008/09/26 04:49:32 tjhunt 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/question/type/questiontype.php
< <?php  // $Id: questiontype.php,v 1.74.2.11 2008/08/20 09:46:03 tjhunt Exp $ 
> <?php  // $Id: questiontype.php,v 1.74.2.12 2008/09/28 09:00:05 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.