Development:Unmerged files

Files with MOODLE_17_MERGED tag not updated - Sun Dec 7 20:06:12 CET 2008

RCS file: /cvsroot/moodle/user/view.php
< <?PHP // $Id: view.php,v 1.123.2.10 2008/11/12 03:50:10 dongsheng Exp $ 
> <?PHP // $Id: view.php,v 1.123.2.11 2008/11/18 02:21:29 dongsheng Exp $

Files with MOODLE_18_MERGED tag not updated - Fri Nov 28 17:43:59 CET 2008

RCS file: /cvsroot/moodle/admin/settings/security.php
 
RCS file: /cvsroot/moodle/blocks/admin/block_admin.php
< <?php //$Id: block_admin.php,v 1.84.2.4 2008/05/02 06:18:06 jerome Exp $ 
> <?php //$Id: block_admin.php,v 1.84.2.5 2008/11/28 06:27:39 ikawhero Exp $ 
 
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 - Fri Nov 28 17:42:27 CET 2008

RCS file: /cvsroot/moodle/admin/uploaduser.php
< <?php  // $Id: uploaduser.php,v 1.68.2.13 2008/09/26 09:10:20 scyrma Exp $ 
> <?php  // $Id: uploaduser.php,v 1.68.2.14 2008/10/18 00:10:00 arborrow Exp $ 
 
RCS file: /cvsroot/moodle/filter/tex/texed.php
< <?PHP // $Id: texed.php,v 1.7.2.1 2007/12/19 17:38:42 skodak Exp $ 
> <?PHP // $Id: texed.php,v 1.7.2.2 2008/11/11 18:35:42 mjollnir_ Exp $ 
 
RCS file: /cvsroot/moodle/grade/edit/outcome/edit_form.php
< <?php  //$Id: edit_form.php,v 1.5.2.2 2008/03/03 10:21:42 nicolasconnault Exp $ 
> <?php  //$Id: edit_form.php,v 1.5.2.3 2008/10/22 09:09:32 nicolasconnault Exp $ 
 
RCS file: /cvsroot/moodle/grade/edit/tree/outcomeitem_form.php
< <?php  //$Id: outcomeitem_form.php,v 1.12.2.13 2008/10/17 14:01:07 nicolasconnault Exp $ 
> <?php  //$Id: outcomeitem_form.php,v 1.12.2.14 2008/10/22 09:09:32 nicolasconnault Exp $ 
 
RCS file: /cvsroot/moodle/lang/en_utf8/grades.php
< <?PHP // $Id: grades.php,v 1.111.2.58 2008/10/17 14:32:44 nicolasconnault Exp $ 
> <?PHP // $Id: grades.php,v 1.111.2.59 2008/10/22 09:09:32 nicolasconnault Exp $ 
 
RCS file: /cvsroot/moodle/lib/formslib.php
< <?php // $Id: formslib.php,v 1.129.2.17 2008/10/13 19:38:49 skodak Exp $ 
> <?php // $Id: formslib.php,v 1.129.2.18 2008/10/22 09:09:31 nicolasconnault Exp $ 
<  * @version $Id: formslib.php,v 1.129.2.17 2008/10/13 19:38:49 skodak Exp $ 
>  * @version $Id: formslib.php,v 1.129.2.18 2008/10/22 09:09:31 nicolasconnault Exp $ 
 
RCS file: /cvsroot/moodle/lib/moodlelib.php
 
RCS file: /cvsroot/moodle/lib/questionlib.php
< <?php  // $Id: questionlib.php,v 1.119.2.18 2008/11/27 11:50:20 tjhunt Exp $ 
> <?php  // $Id: questionlib.php,v 1.119.2.19 2008/11/28 02:41:06 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/mod/quiz/report/grading/report.php
< <?php  // $Id: report.php,v 1.25.2.13 2008/08/12 06:07:13 tjhunt Exp $ 
> <?php  // $Id: report.php,v 1.25.2.14 2008/11/28 06:07:24 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/question/type/questiontype.php
< <?php  // $Id: questiontype.php,v 1.74.2.13 2008/10/08 10:19:51 jamiesensei Exp $ 
> <?php  // $Id: questiontype.php,v 1.74.2.14 2008/11/28 06:07:25 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/question/type/essay/questiontype.php
< <?php  // $Id: questiontype.php,v 1.20.2.7 2008/08/20 09:46:03 tjhunt Exp $ 
> <?php  // $Id: questiontype.php,v 1.20.2.8 2008/11/28 06:07:24 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/question/type/random/questiontype.php
< <?php  // $Id: questiontype.php,v 1.12.2.6 2008/11/10 07:56:43 tjhunt Exp $ 
> <?php  // $Id: questiontype.php,v 1.12.2.7 2008/11/28 06:07:25 tjhunt 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.