Development:Unmerged files: Difference between revisions

Revision as of 22:53, 30 March 2007

Files with MOODLE_16_MERGED tag not updated - Sun Mar 18 23:51:39 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/backup/restorelib.php,v 
< <?php //$Id: restorelib.php,v 1.166.2.9 2006/10/04 17:33:48 stronk7 Exp $ 
> <?php //$Id: restorelib.php,v 1.166.2.10 2007/03/13 17:43:10 tjhunt 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/filter/mediaplugin/filter.php,v 
 
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/lib/statslib.php,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/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/question/type/multianswer/questiontype.php,v 
< <?php  // $Id: questiontype.php,v 1.7.2.9 2007/03/15 12:58:38 tjhunt Exp $ 
> <?php  // $Id: questiontype.php,v 1.7.2.10 2007/03/17 22:58:30 poltawski 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 - Sat Mar 31 00:33:24 CEST 2007

RCS file: /cvsroot/moodle/moodle/blocks/db/Attic/migrate2utf8.php,v 
< <?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/mod/scorm/datamodels/scorm_13lib.php,v

Files with MOODLE_18_MERGED tag not updated - Sat Mar 31 00:52:08 CEST 2007

RCS file: /cvsroot/moodle/moodle/lib/simpletest/testmodforumlib.php,v 
< <?php // $Id: testmodforumlib.php,v 1.1.2.1 2007/03/12 05:27:43 nicolasconnault Exp $ 
> <?php // $Id: testmodforumlib.php,v 1.1.2.2 2007/03/14 00:45:10 nicolasconnault Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/scorm/datamodels/scorm_13.js.php,v

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.

@@ Line 85: / Line 85: @@
   RCS file: /cvsroot/moodle/moodle/mod/scorm/datamodels/scorm_13lib.php,v
-==Files with MOODLE_18_MERGED tag not updated - Fri Mar 30 19:33:40 CEST 2007 ==
+==Files with MOODLE_18_MERGED tag not updated - Sat Mar 31 00:52:08 CEST 2007 ==
- RCS file: /cvsroot/moodle/moodle/tags,v
- RCS file: /cvsroot/moodle/moodle/admin/register.php,v
- RCS file: /cvsroot/moodle/moodle/blog/footer.php,v
- RCS file: /cvsroot/moodle/moodle/filter/emailprotect/filter.php,v
- < <?PHP // $Id: filter.php,v 1.1 2004/09/02 04:14:06 moodler Exp $
- > <?PHP // $Id: filter.php,v 1.1.24.1 2007/03/20 07:08:04 nicolasconnault Exp $
- RCS file: /cvsroot/moodle/moodle/lang/en_utf8/block_course_list.php,v
- < <?PHP // $Id: block_course_list.php,v 1.2 2006/11/01 09:44:02 moodler Exp $
- > <?PHP // $Id: block_course_list.php,v 1.2.4.1 2007/02/26 15:13:05 andreabix Exp $
- RCS file: /cvsroot/moodle/moodle/lang/en_utf8/mnet.php,v
- RCS file: /cvsroot/moodle/moodle/lang/en_utf8/moodle.php,v
- < <?PHP // $Id: moodle.php,v 1.105.2.9 2007/03/26 06:44:40 toyomoyo Exp $
- > <?PHP // $Id: moodle.php,v 1.105.2.10 2007/03/26 06:55:17 toyomoyo Exp $
- RCS file: /cvsroot/moodle/moodle/lib/javascript-static.js,v
- RCS file: /cvsroot/moodle/moodle/lib/setuplib.php,v
- < <?php // $Id: setuplib.php,v 1.19 2007/01/13 10:44:58 stronk7 Exp $
- > <?php // $Id: setuplib.php,v 1.19.2.4 2007/03/28 17:13:17 sam_marshall Exp $
   RCS file: /cvsroot/moodle/moodle/lib/simpletest/testmodforumlib.php,v
@@ Line 117: / Line 91: @@
   > <?php // $Id: testmodforumlib.php,v 1.1.2.2 2007/03/14 00:45:10 nicolasconnault Exp $
- RCS file: /cvsroot/moodle/moodle/mnet/environment.php,v
+  RCS file: /cvsroot/moodle/moodle/mod/scorm/datamodels/scorm_13.js.php,v
- RCS file: /cvsroot/moodle/moodle/mnet/lib.php,v
- RCS file: /cvsroot/moodle/moodle/mnet/xmlrpc/client.php,v
- RCS file: /cvsroot/moodle/moodle/mnet/xmlrpc/server.php,v
- RCS file: /cvsroot/moodle/moodle/mod/data/lib.php,v
- < <?php  // $Id: lib.php,v 1.113.2.2 2007/03/01 06:32:35 toyomoyo Exp $
- > <?php  // $Id: lib.php,v 1.113.2.3 2007/03/13 01:20:19 nicolasconnault Exp $
- RCS file: /cvsroot/moodle/moodle/mod/resource/config.html,v
- RCS file: /cvsroot/moodle/moodle/mod/resource/type/repository/resource.class.php,v
- < <?php // $Id: resource.class.php,v 1.17.2.1 2007/02/28 05:36:37 nicolasconnault Exp $
- > <?php // $Id: resource.class.php,v 1.17.2.2 2007/03/20 07:08:07 nicolasconnault Exp $
- RCS file: /cvsroot/moodle/moodle/mod/scorm/backuplib.php,v
- < <?php //$Id: backuplib.php,v 1.18 2006/11/21 16:12:20 bobopinna Exp $
- > <?php //$Id: backuplib.php,v 1.18.4.1 2007/03/23 10:53:24 csantossaenz Exp $
- RCS file: /cvsroot/moodle/moodle/mod/scorm/datamodel.php,v
- RCS file: /cvsroot/moodle/moodle/mod/scorm/lib.php,v
- < <?php  // $Id: lib.php,v 1.83 2007/01/25 13:49:50 bobopinna Exp $
- > <?php  // $Id: lib.php,v 1.83.2.1 2007/03/29 10:47:43 csantossaenz Exp $
- RCS file: /cvsroot/moodle/moodle/mod/scorm/version.php,v
- < <?php // $Id: version.php,v 1.49 2007/02/02 13:02:31 moodler Exp $
- > <?php // $Id: version.php,v 1.49.2.1 2007/03/13 22:09:24 bobopinna Exp $
-  RCS file: /cvsroot/moodle/moodle/mod/scorm/datamodels/scorm_13.js.php,v
- RCS file: /cvsroot/moodle/moodle/mod/scorm/db/upgrade.php,v
- < <?php  //$Id: upgrade.php,v 1.8 2007/01/24 20:24:51 bobopinna Exp $
- > <?php  //$Id: upgrade.php,v 1.8.2.2 2007/03/15 07:45:32 bobopinna Exp $
- RCS file: /cvsroot/moodle/moodle/mod/wiki/lib.php,v
- < <?php  // $Id: lib.php,v 1.49 2007/02/22 17:46:27 sam_marshall Exp $
- > <?php  // $Id: lib.php,v 1.48.2.1 2007/02/22 17:46:13 sam_marshall Exp $
 ==To generate this information yourself==

Documentation

Development:Unmerged files: Difference between revisions

Revision as of 22:53, 30 March 2007

Contents

Files with MOODLE_16_MERGED tag not updated - Sun Mar 18 23:51:39 CET 2007

Files with MOODLE_17_MERGED tag not updated - Sat Mar 31 00:33:24 CEST 2007

Files with MOODLE_18_MERGED tag not updated - Sat Mar 31 00:52:08 CEST 2007

To generate this information yourself

Some useful links