Development:Unmerged files

Files with MOODLE_17_MERGED tag not updated - Fri Sep 14 17:29:57 CEST 2007

RCS file: /cvsroot/moodle/moodle/auth/ldap/Attic/lib.php
<  * @version $Id: lib.php,v 1.83.2.2 2006/12/29 21:18:37 skodak Exp $ 
>  * @version $Id: lib.php,v 1.83.2.3 2007/05/21 05:27:54 moodler Exp $ 
 
RCS file: /cvsroot/moodle/moodle/blocks/db/Attic/migrate2utf8.php
< <?php // $Id: migrate2utf8.php,v 1.9 2006/06/08 04:08:04 toyomoyo Exp $ 
> <?php // $Id: migrate2utf8.php,v 1.9.4.1 2007/02/28 00:10:12 martinlanghoff Exp $ 
 
RCS file: /cvsroot/moodle/moodle/course/Attic/edit.html
 
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/scorm.php
< <?PHP // $Id: scorm.php,v 1.9.2.2 2007/03/13 08:47:52 moodler Exp $  
> <?PHP // $Id: scorm.php,v 1.9.2.3 2007/07/03 08:05:57 bobopinna Exp $  
 
RCS file: /cvsroot/moodle/moodle/lib/accesslib.php
 
RCS file: /cvsroot/moodle/moodle/lib/db/Attic/migrate2utf8.php
< <?php // $Id: migrate2utf8.php,v 1.26.2.1 2006/10/22 22:57:27 stronk7 Exp $ 
> <?php // $Id: migrate2utf8.php,v 1.26.2.2 2007/04/02 08:41:57 toyomoyo Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/scorm/lib.php
< <?php  // $Id: lib.php,v 1.76.2.2 2007/03/29 08:18:35 csantossaenz Exp $ 
> <?php  // $Id: lib.php,v 1.76.2.3 2007/07/03 14:11:20 bobopinna Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/scorm/Attic/mod.html
 
RCS file: /cvsroot/moodle/moodle/mod/scorm/player.php
< <?PHP  // $Id: player.php,v 1.16.2.4 2007/03/15 15:25:51 bobopinna Exp $ 
> <?PHP  // $Id: player.php,v 1.16.2.5 2007/07/08 00:15:39 poltawski Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/scorm/Attic/validate.php
< <?php // $Id: validate.php,v 1.17.4.1 2007/03/15 15:54:36 bobopinna Exp $ 
> <?php // $Id: validate.php,v 1.17.4.2 2007/07/03 09:24:38 bobopinna Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/scorm/datamodels/scorm_12lib.php
 
RCS file: /cvsroot/moodle/moodle/mod/scorm/datamodels/scorm_13lib.php

Files with MOODLE_18_MERGED tag not updated - Fri Sep 14 17:18:30 CEST 2007

RCS file: /cvsroot/moodle/moodle/admin/index.php
 
RCS file: /cvsroot/moodle/moodle/auth/cas/auth.php
 
RCS file: /cvsroot/moodle/moodle/filter/tex/texdebug.php
< <?PHP // $Id: texdebug.php,v 1.16.2.3 2007/09/11 13:53:24 thepurpleblob Exp $ 
> <?PHP // $Id: texdebug.php,v 1.16.2.4 2007/09/11 14:52:51 thepurpleblob Exp $ 
 
RCS file: /cvsroot/moodle/moodle/grade/lib.php
< <?php // $Id: lib.php,v 1.65.2.6 2007/08/01 05:10:54 moodler Exp $ 
> <?php // $Id: lib.php,v 1.65.2.8 2007/09/12 03:38:53 arborrow Exp $ 
 
RCS file: /cvsroot/moodle/moodle/group/Attic/version.php
 
RCS file: /cvsroot/moodle/moodle/group/db/Attic/upgrade.php
< <?php  //$Id: upgrade.php,v 1.11.2.5 2007/05/18 09:50:58 skodak Exp $ 
> <?php  //$Id: upgrade.php,v 1.11.2.6 2007/09/10 01:54:33 toyomoyo Exp $ 
 
RCS file: /cvsroot/moodle/moodle/lib/accesslib.php
< <?php // $Id: accesslib.php,v 1.221.2.43 2007/08/06 19:16:17 poltawski Exp $ 
> <?php // $Id: accesslib.php,v 1.221.2.44 2007/09/12 10:46:34 skodak Exp $ 
 
RCS file: /cvsroot/moodle/moodle/lib/filelib.php
< <?php //$Id: filelib.php,v 1.39.2.4 2007/08/17 04:57:08 toyomoyo Exp $ 
> <?php //$Id: filelib.php,v 1.39.2.6 2007/08/23 06:42:24 moodler Exp $ 
 
RCS file: /cvsroot/moodle/moodle/lib/moodlelib.php
 
RCS file: /cvsroot/moodle/moodle/lib/pagelib.php
< <?php //$Id: pagelib.php,v 1.52.2.1 2007/02/24 23:31:22 defacer Exp $ 
> <?php //$Id: pagelib.php,v 1.52.2.2 2007/09/12 10:46:07 skodak Exp $ 
<  * @version  $Id: pagelib.php,v 1.52.2.1 2007/02/24 23:31:22 defacer Exp $ 
>  * @version  $Id: pagelib.php,v 1.52.2.2 2007/09/12 10:46:07 skodak Exp $ 
 
RCS file: /cvsroot/moodle/moodle/lib/weblib.php
< <?php // $Id: weblib.php,v 1.812.2.77 2007/09/12 03:33:18 martinlanghoff Exp $ 
> <?php // $Id: weblib.php,v 1.812.2.78 2007/09/12 10:45:52 skodak Exp $ 
<  * @version  $Id: weblib.php,v 1.812.2.77 2007/09/12 03:33:18 martinlanghoff Exp $ 
>  * @version  $Id: weblib.php,v 1.812.2.78 2007/09/12 10:45:52 skodak Exp $ 
 
RCS file: /cvsroot/moodle/moodle/lib/db/install.xml
 
RCS file: /cvsroot/moodle/moodle/mnet/xmlrpc/server.php
 
RCS file: /cvsroot/moodle/moodle/mod/forum/lib.php
< <?php  // $Id: lib.php,v 1.536.2.36 2007/08/13 05:38:14 toyomoyo Exp $ 
> <?php  // $Id: lib.php,v 1.536.2.37 2007/08/23 13:38:21 mchurch Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/quiz/mod_form.php
 
RCS file: /cvsroot/moodle/moodle/mod/scorm/locallib.php
< <?php  // $Id: locallib.php,v 1.34.2.7 2007/06/06 22:16:38 bobopinna Exp $ 
> <?php  // $Id: locallib.php,v 1.34.2.8 2007/09/13 10:26:58 bobopinna Exp $

To generate this information yourself

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

cvs diff -r MOODLE_18_MERGED -r MOODLE_18_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 [https://tracker.moodle.org/browse/MDL-8912 MDL-8912]: Progress in the Moodle Tracker about these unmerged files.