Development:Unmerged files

Files with MOODLE_17_MERGED tag not updated - Fri Jun 20 16:53:30 CEST 2008

RCS file: /cvsroot/moodle/question/backuplib.php
< <?php //$Id: backuplib.php,v 1.7.2.3 2007/03/02 05:20:39 moodler Exp $ 
> <?php //$Id: backuplib.php,v 1.7.2.4 2008/06/18 14:29:38 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/user/index.php
< <?PHP // $Id: index.php,v 1.142.2.13 2007/07/04 08:33:04 skodak Exp $ 
> <?PHP // $Id: index.php,v 1.142.2.14 2008/05/28 14:57:24 mchurch Exp $

Files with MOODLE_18_MERGED tag not updated - Fri Jun 20 16:53:11 CEST 2008

RCS file: /cvsroot/moodle/admin/roles/assign.html
 
RCS file: /cvsroot/moodle/mod/scorm/datamodel.php
 
RCS file: /cvsroot/moodle/mod/scorm/datamodels/scorm_13lib.php
< <?php // $Id: scorm_13lib.php,v 1.6.2.2 2007/11/15 07:54:37 bobopinna Exp $ 
> <?php // $Id: scorm_13lib.php,v 1.6.2.3 2008/06/05 21:12:43 mchurch Exp $ 
 
RCS file: /cvsroot/moodle/question/backuplib.php
< <?php //$Id: backuplib.php,v 1.8.2.1 2007/03/09 02:58:20 toyomoyo Exp $ 
> <?php //$Id: backuplib.php,v 1.8.2.2 2008/06/18 14:29:34 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/search/querylib.php
 
RCS file: /cvsroot/moodle/search/documents/physical_pdf.php
 
RCS file: /cvsroot/moodle/search/documents/physical_xml.php
 
RCS file: /cvsroot/moodle/theme/standard/styles_layout.css
 
RCS file: /cvsroot/moodle/user/editadvanced_form.php
< <?php //$Id: editadvanced_form.php,v 1.6.2.4 2007/10/08 13:58:24 nfreear Exp $ 
> <?php //$Id: editadvanced_form.php,v 1.6.2.5 2008/04/25 14:41:28 skodak Exp $ 
 
RCS file: /cvsroot/moodle/user/index.php
< <?PHP // $Id: index.php,v 1.162.2.19 2008/02/08 04:01:20 moodler Exp $ 
> <?PHP // $Id: index.php,v 1.162.2.22 2008/05/28 14:56:02 mchurch Exp $

Files with MOODLE_19_MERGED tag not updated - Fri Jun 20 16:52:17 CEST 2008

RCS file: /cvsroot/moodle/lang/en_utf8/help/quiz/timelimit.html
 
RCS file: /cvsroot/moodle/lib/adminlib.php
 
RCS file: /cvsroot/moodle/lib/questionlib.php
< <?php  // $Id: questionlib.php,v 1.119.2.10 2008/05/25 11:35:30 jamiesensei Exp $ 
> <?php  // $Id: questionlib.php,v 1.119.2.11 2008/06/16 09:04:31 nicolasconnault Exp $ 
 
RCS file: /cvsroot/moodle/lib/weblib.php
< <?php // $Id: weblib.php,v 1.970.2.92 2008/06/18 05:40:19 jerome Exp $ 
> <?php // $Id: weblib.php,v 1.970.2.93 2008/06/19 18:38:36 tjhunt Exp $ 
<  * @version  $Id: weblib.php,v 1.970.2.92 2008/06/18 05:40:19 jerome Exp $ 
>  * @version  $Id: weblib.php,v 1.970.2.93 2008/06/19 18:38:36 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/lib/db/install.xml
 
RCS file: /cvsroot/moodle/mod/hotpot/template/v6.php
 
RCS file: /cvsroot/moodle/mod/scorm/datamodel.php
 
RCS file: /cvsroot/moodle/mod/scorm/datamodels/scorm_13lib.php
< <?php // $Id: scorm_13lib.php,v 1.7.2.2 2008/03/15 15:04:30 skodak Exp $ 
> <?php // $Id: scorm_13lib.php,v 1.7.2.3 2008/06/05 20:58:26 mchurch Exp $ 
 
RCS file: /cvsroot/moodle/question/backuplib.php
< <?php // $Id: backuplib.php,v 1.13.2.5 2008/04/29 03:28:25 scyrma Exp $ 
> <?php // $Id: backuplib.php,v 1.13.2.6 2008/06/18 14:29:40 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/question/type/questiontype.php
< <?php  // $Id: questiontype.php,v 1.74.2.8 2008/05/25 11:35:30 jamiesensei Exp $ 
> <?php  // $Id: questiontype.php,v 1.74.2.10 2008/06/11 08:46:50 nicolasconnault Exp $ 
 
RCS file: /cvsroot/moodle/question/type/essay/questiontype.php
< <?php  // $Id: questiontype.php,v 1.20.2.5 2007/12/17 12:28:00 tjhunt Exp $ 
> <?php  // $Id: questiontype.php,v 1.20.2.6 2008/06/12 04:48:21 nicolasconnault Exp $ 
 
RCS file: /cvsroot/moodle/question/type/match/questiontype.php
< <?php  // $Id: questiontype.php,v 1.32.2.3 2008/05/07 12:31:38 tjhunt Exp $ 
> <?php  // $Id: questiontype.php,v 1.32.2.4 2008/06/10 20:52:46 nicolasconnault Exp $ 
 
RCS file: /cvsroot/moodle/question/type/multichoice/questiontype.php
< <?php  // $Id: questiontype.php,v 1.29.2.3 2008/01/08 18:29:17 tjhunt Exp $ 
> <?php  // $Id: questiontype.php,v 1.29.2.4 2008/06/12 04:48:21 nicolasconnault Exp $ 
 
RCS file: /cvsroot/moodle/question/type/numerical/questiontype.php
<  * @version $Id: questiontype.php,v 1.14.4.6 2007/12/13 18:48:16 tjhunt Exp $ 
>  * @version $Id: questiontype.php,v 1.14.4.7 2008/06/12 04:48:21 nicolasconnault Exp $ 
 
RCS file: /cvsroot/moodle/question/type/shortanswer/questiontype.php
< <?php  // $Id: questiontype.php,v 1.20.2.5 2007/12/13 17:24:51 tjhunt Exp $ 
> <?php  // $Id: questiontype.php,v 1.20.2.6 2008/06/12 04:48:21 nicolasconnault Exp $ 
 
RCS file: /cvsroot/moodle/question/type/truefalse/questiontype.php
< <?php  // $Id: questiontype.php,v 1.17.2.3 2008/05/07 12:31:37 tjhunt Exp $ 
> <?php  // $Id: questiontype.php,v 1.17.2.4 2008/06/12 04:48:20 nicolasconnault Exp $ 
 
RCS file: /cvsroot/moodle/search/querylib.php
 
RCS file: /cvsroot/moodle/search/documents/physical_xml.php
 
RCS file: /cvsroot/moodle/user/index.php
< <?PHP // $Id: index.php,v 1.194.2.15 2008/05/08 02:42:53 jerome Exp $ 
> <?PHP // $Id: index.php,v 1.194.2.16 2008/05/28 14:52:15 mchurch Exp $

To generate this information yourself

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

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