Development:Unmerged files

Files with MOODLE_16_MERGED tag not updated - Fri Feb 23 01:42:54 CET 2007

RCS file: /cvsroot/moodle/moodle/admin/Attic/utfdbmigrate.php,v 
< <?php //$Id: utfdbmigrate.php,v 1.47.2.12 2006/07/29 09:43:36 skodak Exp $ 
> <?php //$Id: utfdbmigrate.php,v 1.47.2.13 2006/09/29 03:16:51 toyomoyo Exp $ 
 
RCS file: /cvsroot/moodle/moodle/blog/header.php,v 
< <?php //$Id: header.php,v 1.19.2.3 2006/06/18 07:44:21 moodler Exp $ 
> <?php //$Id: header.php,v 1.19.2.4 2006/11/02 03:19:37 moodler Exp $ 
 
RCS file: /cvsroot/moodle/moodle/blog/lib.php,v 
< <?php //$Id: lib.php,v 1.38.2.2 2006/10/07 16:34:20 gustav_delius Exp $ 
> <?php //$Id: lib.php,v 1.38.2.3 2006/11/02 05:52:48 moodler Exp $ 
 
RCS file: /cvsroot/moodle/moodle/grade/index.php,v 
 
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/currencies.php,v 
< <?PHP // $Id: currencies.php,v 1.1.2.1 2006/12/29 19:20:29 skodak Exp $  
> <?PHP // $Id: currencies.php,v 1.1.2.2 2007/02/17 23:37:26 koenr Exp $  
 
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/hotpot.php,v 
< <?PHP // $Id: hotpot.php,v 1.1.2.1 2006/05/24 11:22:07 gbateson Exp $  
> <?PHP // $Id: hotpot.php,v 1.1.2.3 2006/10/05 06:21:26 gbateson Exp $  
 
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/help/hotpot/reportcontent.html,v 
 
RCS file: /cvsroot/moodle/moodle/mod/data/backuplib.php,v 
 
RCS file: /cvsroot/moodle/moodle/mod/data/restorelib.php,v 
 
RCS file: /cvsroot/moodle/moodle/mod/forum/lib.php,v 
< <?php  // $Id: lib.php,v 1.489.2.27 2007/02/09 01:27:34 vyshane Exp $ 
> <?php  // $Id: lib.php,v 1.437.2.11 2007/02/09 07:32:21 vyshane Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/forum/post.php,v 
< <?php // $Id: post.php,v 1.112.2.14 2007/01/12 05:03:57 vyshane Exp $ 
> <?php // $Id: post.php,v 1.94.2.9 2007/02/09 07:32:21 vyshane Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/lesson/action/continue.php,v 
< <?php // $Id: continue.php,v 1.19.2.4 2006/09/09 17:25:21 mark-nielsen Exp $ 
> <?php // $Id: continue.php,v 1.19.2.6 2006/12/06 01:45:31 mark-nielsen Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/scorm/report.php,v 
< <?php  // $Id: report.php,v 1.26.2.2 2006/09/19 09:07:44 bobopinna Exp $ 
> <?php  // $Id: report.php,v 1.26.2.3 2007/01/18 20:32:33 bobopinna Exp $ 
 
RCS file: /cvsroot/moodle/moodle/theme/cornflower/config.php,v 
< <?PHP // $Id: config.php,v 1.4 2006/04/29 19:46:41 gustav_delius Exp $ 
> <?PHP // $Id: config.php,v 1.4.2.1 2006/11/02 18:10:14 watcanz Exp $ 
 
RCS file: /cvsroot/moodle/moodle/theme/cornflower/header.html,v 
 
RCS file: /cvsroot/moodle/moodle/theme/cornflower/styles_color.css,v 
 
RCS file: /cvsroot/moodle/moodle/theme/cornflower/styles_fonts.css,v 
 
RCS file: /cvsroot/moodle/moodle/theme/cornflower/styles_layout.css,v 
 
RCS file: /cvsroot/moodle/moodle/theme/cornflower/images/logo.jpg,v 
 
RCS file: /cvsroot/moodle/moodle/theme/cornflower/images/logo.psd,v 
 
RCS file: /cvsroot/moodle/moodle/theme/oceanblue/styles_color.css,v 
 
RCS file: /cvsroot/moodle/moodle/theme/standard/styles_layout.css,v 
 
RCS file: /cvsroot/moodle/moodle/user/messageselect.php,v

Files with MOODLE_17_MERGED tag not updated - Tue Feb 20 00:59:55 CET 2007

RCS file: /cvsroot/moodle/moodle/admin/cron.php,v 
< <?PHP // $Id: cron.php,v 1.89.2.4 2006/10/26 08:53:59 skodak Exp $ 
> <?PHP // $Id: cron.php,v 1.89.2.5 2007/02/14 21:00:58 skodak Exp $ 
 
RCS file: /cvsroot/moodle/moodle/admin/roles/manage.php,v 
< <?php //$Id: manage.php,v 1.32.2.5 2006/11/20 17:40:45 skodak Exp $ 
> <?php //$Id: manage.php,v 1.32.2.6 2007/02/16 02:39:28 moodler Exp $ 
 
RCS file: /cvsroot/moodle/moodle/blocks/moodleblock.class.php,v 
< <?php  // $Id: moodleblock.class.php,v 1.73.2.2 2006/11/15 03:34:09 vyshane Exp $ 
> <?php  // $Id: moodleblock.class.php,v 1.73.2.3 2007/02/16 01:24:30 moodler Exp $ 
<  * @version  $Id: moodleblock.class.php,v 1.73.2.2 2006/11/15 03:34:09 vyshane Exp $ 
>  * @version  $Id: moodleblock.class.php,v 1.73.2.3 2007/02/16 01:24:30 moodler Exp $ 
 
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/currencies.php,v 
< <?PHP // $Id: currencies.php,v 1.4.2.1 2006/11/01 09:37:07 moodler Exp $  
> <?PHP // $Id: currencies.php,v 1.4.2.2 2007/02/17 23:37:03 koenr Exp $

Files with MOODLE_18_MERGED tag not updated - Tue Feb 20 01:02:05 CET 2007

RCS file: /cvsroot/moodle/moodle/blog/footer.php,v 
 
RCS file: /cvsroot/moodle/moodle/blog/header.php,v 
< <?php //$Id: header.php,v 1.33 2007/02/06 08:24:39 toyomoyo Exp $ 
> <?php //$Id: header.php,v 1.33.2.1 2007/02/15 03:20:28 toyomoyo Exp $ 
 
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/currencies.php,v 
< <?PHP // $Id: currencies.php,v 1.5 2006/11/01 09:44:04 moodler Exp $  
> <?PHP // $Id: currencies.php,v 1.5.4.1 2007/02/17 23:37:51 koenr Exp $  
 
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/help/index.html,v 
 
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/help/forum/index.html,v 
 
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/help/quiz/index.html,v 
 
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/help/workshop/index.html,v 
 
RCS file: /cvsroot/moodle/moodle/mod/wiki/view.php,v 
< <?php  // $Id: view.php,v 1.67 2007/02/16 14:31:27 sam_marshall Exp $ 
> <?php  // $Id: view.php,v 1.66.2.1 2007/02/16 14:21:13 sam_marshall Exp $ 
 
RCS file: /cvsroot/moodle/moodle/user/edit_form.php,v 
< <?php //$Id: edit_form.php,v 1.19 2007/01/26 18:42:47 skodak Exp $ 
> <?php //$Id: edit_form.php,v 1.19.2.1 2007/02/19 02:27:55 moodler Exp $

To generate this information yourself

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

cvs diff -r MOODLE_17_MERGED -r MOODLE_17_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.