Note: You are currently viewing documentation for Moodle 2.3. Up-to-date documentation for the latest stable version is available here: Unmerged files.

Development:Unmerged files: Difference between revisions

From MoodleDocs
No edit summary
 
(404 intermediate revisions by 6 users not shown)
Line 1: Line 1:
__NOEDITSECTION__
==Unmerged Files Report==


 
__UNMERGED_FILES_REPORT__
==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 - Fri Feb 23 01:46:12 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/backup/restorelib.php,v
 
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 $ 
 
RCS file: /cvsroot/moodle/moodle/lib/moodlelib.php,v
 
==Files with MOODLE_18_MERGED tag not updated - Fri Feb 23 01:47:48 CET 2007 ==
 
RCS file: /cvsroot/moodle/moodle/index.php,v
< <?php  // $Id: index.php,v 1.184 2007/02/14 04:56:26 toyomoyo Exp $
> <?php  // $Id: index.php,v 1.184.2.1 2007/02/20 20:19:17 urs_hunkler Exp $
 
RCS file: /cvsroot/moodle/moodle/blog/footer.php,v
 
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/mnet.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/forum/post_form.php,v
< <?php  // $Id: post_form.php,v 1.19 2007/02/22 03:22:31 toyomoyo Exp $
> <?php  // $Id: post_form.php,v 1.18.2.1 2007/02/22 03:21:49 toyomoyo 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 $
 
RCS file: /cvsroot/moodle/moodle/mod/wiki/view.php,v
< <?php  // $Id: view.php,v 1.68 2007/02/22 17:46:27 sam_marshall Exp $
> <?php  // $Id: view.php,v 1.66.2.2 2007/02/22 17:46:13 sam_marshall Exp $


==To generate this information yourself==
==To generate this information yourself==
Line 129: Line 8:
Run the following commandline at the top level of your CVS sandbox:
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
  cvs diff -kkv -r MOODLE_19_MERGED -r MOODLE_19_STABLE | egrep '^(RCS|[<>] <\?[Pp][Hh][Pp] *\/\/ *\$Id)' > unmergedfiles.txt; cat unmergedfiles.txt


==Some useful links==
==Some useful links==
Line 136: Line 15:
* [http://moodle.org/mod/forum/discuss.php?d=43267 Review Unmerged files, please...] discussion from moodle.org forums.
* [http://moodle.org/mod/forum/discuss.php?d=43267 Review Unmerged files, please...] discussion from moodle.org forums.


[[Category:Developer]]
* Tracker Task MDL-8912: Progress in the Moodle Tracker about these unmerged files.
 
[[Category:Developer|Unmerged files]]

Latest revision as of 15:49, 8 January 2009

Unmerged Files Report

__UNMERGED_FILES_REPORT__

To generate this information yourself

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

cvs diff -kkv -r MOODLE_19_MERGED -r MOODLE_19_STABLE | egrep '^(RCS|[<>] <\?[Pp][Hh][Pp] *\/\/ *\$Id)' > unmergedfiles.txt; cat unmergedfiles.txt

Some useful links

  • Tracker Task MDL-8912: Progress in the Moodle Tracker about these unmerged files.
Retrieved from "https://docs.moodle.org/23/en/index.php?title=Development:Unmerged_files&oldid=48694"
Powered by MediaWiki