Development:Unmerged files

Files with MOODLE_17_MERGED tag not updated - Mon Jun 9 09:09:40 CEST 2008

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 - Mon Jun 9 09:10:12 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/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/index.php
< <?PHP // $Id: index.php,v 1.162.2.21 2008/04/15 05:45:57 dongsheng 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 - Wed May 14 00:48:31 CEST 2008

RCS file: /cvsroot/moodle/mod/data/import.php
< <?php  // $Id: import.php,v 1.21.2.3 2008/05/12 19:55:20 robertall Exp $ 
> <?php  // $Id: import.php,v 1.21.2.4 2008/05/13 15:28:37 robertall Exp $ 
 
RCS file: /cvsroot/moodle/mod/quiz/report/overview/overviewgraph.php
< <?php  // $Id: overviewgraph.php,v 1.1.2.2 2008/05/07 14:40:57 jamiesensei Exp $ 
> <?php  // $Id: overviewgraph.php,v 1.1.2.3 2008/05/13 15:03:29 jamiesensei Exp $ 
 
RCS file: /cvsroot/moodle/search/querylib.php
 
RCS file: /cvsroot/moodle/search/documents/physical_xml.php

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.