Development:Unmerged files: Difference between revisions

Revision as of 08:44, 15 November 2006

Files with MOODLE_15_MERGED tag not updated - Tue Nov 14 17:43:10 CET 2006

RCS file: /cvsroot/moodle/moodle/lang/en/docs/Attic/release.html,v 
< $Id: release.html,v 1.83.2.18 2006/02/06 09:59:38 moodler Exp $
> $Id: release.html,v 1.83.2.20 2006/05/21 07:59:15 moodler Exp $
 
RCS file: /cvsroot/moodle/moodle/lib/editor/Attic/htmlarea.php,v 
< // $Id: htmlarea.php,v 1.60.2.9 2006/01/25 23:41:11 julmis Exp $ 
> // $Id: htmlarea.php,v 1.60.2.10 2006/05/14 09:22:24 urs_hunkler Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/hotpot/README.TXT,v 
 
RCS file: /cvsroot/moodle/moodle/mod/hotpot/lib.php,v 
< <?PHP  // $Id: lib.php,v 1.6.2.6 2006/05/02 05:57:13 moodler Exp $ 
> <?PHP  // $Id: lib.php,v 1.6.2.7 2006/08/31 21:36:32 gbateson Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/hotpot/report.php,v 
< <?PHP  // $Id: report.php,v 1.1.2.2 2006/08/10 15:51:48 skodak Exp $ 
> <?PHP  // $Id: report.php,v 1.1.2.3 2006/08/29 06:34:23 gbateson Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/hotpot/report/fullstat/report.php,v 
< <?php  // $Id: report.php,v 1.1.2.1 2005/12/06 03:41:22 gbateson Exp $ 
> <?php  // $Id: report.php,v 1.1.2.2 2006/08/29 08:26:24 gbateson Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/hotpot/report/overview/report.php,v 
< <?php  // $Id: report.php,v 1.1.2.1 2005/12/06 03:41:22 gbateson Exp $ 
> <?php  // $Id: report.php,v 1.1.2.2 2006/08/29 08:26:24 gbateson Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/hotpot/report/simplestat/report.php,v 
< <?php  // $Id: report.php,v 1.1.2.1 2005/12/06 03:41:22 gbateson Exp $ 
> <?php  // $Id: report.php,v 1.1.2.2 2006/08/29 08:26:24 gbateson Exp $

Files with MOODLE_16_MERGED tag not updated - Tue Nov 14 21:12:39 CET 2006

RCS file: /cvsroot/moodle/moodle/tags,v 
 
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/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/hotpot/hotpot-full.js,v 
 
RCS file: /cvsroot/moodle/moodle/mod/hotpot/index.php,v 
< <?PHP // $Id: index.php,v 1.5 2005/11/08 07:48:10 gbateson Exp $ 
> <?PHP // $Id: index.php,v 1.5.4.3 2006/10/02 00:30:32 gbateson Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/hotpot/lib.php,v 
< <?PHP  // $Id: lib.php,v 1.47.2.2 2006/09/13 08:17:50 gbateson Exp $ 
> <?PHP  // $Id: lib.php,v 1.47.2.4 2006/10/01 06:22:12 gbateson Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/hotpot/mod.html,v 
 
RCS file: /cvsroot/moodle/moodle/mod/hotpot/report.php,v 
< <?PHP  // $Id: report.php,v 1.8.2.1 2006/08/10 15:30:56 skodak Exp $ 
> <?PHP  // $Id: report.php,v 1.8.2.8 2006/10/11 01:41:26 gbateson Exp $
 
RCS file: /cvsroot/moodle/moodle/mod/hotpot/restorelib.php,v 
< <?PHP //$Id: restorelib.php,v 1.11.2.3 2006/09/01 03:58:09 gbateson Exp $ 
> <?PHP //$Id: restorelib.php,v 1.11.2.4 2006/10/05 07:12:15 gbateson Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/hotpot/show.php,v 
< <?php // $Id: show.php,v 1.9 2006/03/07 21:46:30 skodak Exp $ 
> <?php // $Id: show.php,v 1.9.2.1 2006/09/28 12:41:49 gbateson Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/hotpot/db/mysql.php,v 
 
RCS file: /cvsroot/moodle/moodle/mod/hotpot/template/v6.php,v 
 
RCS file: /cvsroot/moodle/moodle/mod/quiz/db/postgres7.php,v 
< <?php // $Id: postgres7.php,v 1.93.2.5 2006/07/18 10:58:40 tjhunt Exp $ 
> <?php // $Id: postgres7.php,v 1.93.2.6 2006/07/31 05:38:21 martinlanghoff 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/standard/styles_layout.css,v

Files with MOODLE_17_MERGED tag not updated - Tue Nov 14 21:15:53 CET 2006

RCS file: /cvsroot/moodle/moodle/lang/en_utf8/admin.php,v 
< <?PHP // $Id: admin.php,v 1.55.2.15 2006/11/07 09:29:06 moodler Exp $  
> <?PHP // $Id: admin.php,v 1.55.2.16 2006/11/08 00:03:43 koenr Exp $  
 
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/help/permissions.html,v 
 
RCS file: /cvsroot/moodle/moodle/lib/adminlib.php,v 
<  * @version  $Id: adminlib.php,v 1.82.2.12 2006/11/06 12:46:20 moodler Exp $ 
>  * @version  $Id: adminlib.php,v 1.82.2.13 2006/11/08 02:41:58 toyomoyo Exp $ 
 
RCS file: /cvsroot/moodle/moodle/lib/moodlelib.php,v 
 
RCS file: /cvsroot/moodle/moodle/lib/weblib.php,v 
 
RCS file: /cvsroot/moodle/moodle/mod/forum/post.php,v 
< <?php // $Id: post.php,v 1.112.2.8 2006/10/26 14:12:40 sam_marshall Exp $ 
> <?php // $Id: post.php,v 1.112.2.10 2006/11/13 06:02:49 vyshane Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/hotpot/template/v6.php,v 
 
RCS file: /cvsroot/moodle/moodle/mod/journal/db/mysql.php,v 
< <?php // $Id: mysql.php,v 1.17 2006/11/07 00:09:37 mjollnir_ Exp $ 
> <?php // $Id: mysql.php,v 1.15.2.2 2006/11/07 00:09:18 mjollnir_ Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/journal/db/postgres7.php,v 
< <?php // $Id: postgres7.php,v 1.13 2006/11/07 00:09:37 mjollnir_ Exp $ 
> <?php // $Id: postgres7.php,v 1.11.2.2 2006/11/07 00:09:18 mjollnir_ Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/journal/db/upgrade.php,v 
< <?php  //$Id: upgrade.php,v 1.1 2006/10/26 17:33:42 stronk7 Exp $ 
> <?php  //$Id: upgrade.php,v 1.1.2.2 2006/10/26 17:43:07 stronk7 Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/lesson/action/continue.php,v 
< <?php // $Id: continue.php,v 1.33 2006/09/30 19:49:41 mark-nielsen Exp $ 
> <?php // $Id: continue.php,v 1.33.2.1 2006/10/30 11:00:39 sam_marshall Exp $ 
<  * @version $Id: continue.php,v 1.33 2006/09/30 19:49:41 mark-nielsen Exp $ 
>  * @version $Id: continue.php,v 1.33.2.1 2006/10/30 11:00:39 sam_marshall Exp $ 
 
RCS file: /cvsroot/moodle/moodle/theme/chameleon/user_styles.css,v 
 
RCS file: /cvsroot/moodle/moodle/theme/chameleon/pix/i/key.gif,v 
 
RCS file: /cvsroot/moodle/moodle/theme/cornflower/README.html,v 
 
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.8.1 2006/11/07 13:49:18 watcanz Exp $ 
 
RCS file: /cvsroot/moodle/moodle/theme/cornflower/docstyles.php,v 
< <?PHP /*  $Id: docstyles.php,v 1.5 2006/05/23 09:16:17 skodak Exp $ */ 
> <?PHP /*  $Id: docstyles.php,v 1.5.4.1 2006/11/07 13:49:18 watcanz Exp $ */ 
 
RCS file: /cvsroot/moodle/moodle/theme/cornflower/footer.html,v 
 
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/metal/gradients.css,v 
 
RCS file: /cvsroot/moodle/moodle/theme/metal/header.html,v 
 
RCS file: /cvsroot/moodle/moodle/theme/orangewhite/styles_color.css,v 
 
RCS file: /cvsroot/moodle/moodle/theme/orangewhite/styles_fonts.css,v 
 
RCS file: /cvsroot/moodle/moodle/theme/orangewhite/styles_layout.css,v 
 
RCS file: /cvsroot/moodle/moodle/theme/standardblue/header.html,v 
 
RCS file: /cvsroot/moodle/moodle/theme/standardgreen/header.html,v 
 
RCS file: /cvsroot/moodle/moodle/theme/standardred/header.html,v

To generate this information yourself

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

cvs diff -r MOODLE_16_MERGED -r MOODLE_16_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 201: / Line 201: @@
 ==Some useful links==
-* [[:en:CVS (developer)|Moodle CVS for developers]]: explains how to work with the Moodle code in CVS.
+* [[:en:Development:CVS for developers|Moodle CVS for developers]]: explains how to work with the Moodle code in CVS.
 * [http://moodle.org/mod/forum/discuss.php?d=43267 Review Unmerged files, please...] discussion from moodle.org forums.
 [[Category:Developer]]

Documentation

Development:Unmerged files: Difference between revisions

Revision as of 08:44, 15 November 2006

Contents

Files with MOODLE_15_MERGED tag not updated - Tue Nov 14 17:43:10 CET 2006

Files with MOODLE_16_MERGED tag not updated - Tue Nov 14 21:12:39 CET 2006

Files with MOODLE_17_MERGED tag not updated - Tue Nov 14 21:15:53 CET 2006

To generate this information yourself

Some useful links