Note: You are currently viewing documentation for Moodle 3.7. Up-to-date documentation for the latest stable version of Moodle may be available here: Unmerged files.

Development:Unmerged files: Difference between revisions

From MoodleDocs
No edit summary
 
(489 intermediate revisions by 7 users not shown)
Line 1: Line 1:
==Files with MOODLE_15_MERGED tag not updated - Sun Aug 6 17:59:10 CEST 2006 ==
__NOEDITSECTION__
 
==Unmerged Files Report==
RCS file: /cvsroot/moodle/moodle/version.php,v
 
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/scorm/api.php,v
 
RCS file: /cvsroot/moodle/moodle/mod/scorm/mod.html,v
 
RCS file: /cvsroot/moodle/moodle/mod/scorm/Attic/playscorm.php,v
< <?PHP  // $Id: playscorm.php,v 1.34.2.3 2006/02/03 08:51:13 bobopinna Exp $
> <?PHP  // $Id: playscorm.php,v 1.34.2.4 2006/06/05 07:46:02 bobopinna Exp $
 
RCS file: /cvsroot/moodle/moodle/mod/scorm/version.php,v
< <?php // $Id: version.php,v 1.24.2.1 2005/07/26 06:18:23 bobopinna Exp $
> <?php // $Id: version.php,v 1.24.2.2 2006/06/05 08:11:29 bobopinna Exp $
 
RCS file: /cvsroot/moodle/moodle/mod/scorm/datamodels/scorm1_3.js.php,v
 
RCS file: /cvsroot/moodle/moodle/mod/scorm/db/mysql.php,v
< <?php // $Id: mysql.php,v 1.19.2.1 2005/06/28 06:57:57 bobopinna Exp $
> <?php // $Id: mysql.php,v 1.19.2.2 2006/06/05 08:11:29 bobopinna Exp $
 
RCS file: /cvsroot/moodle/moodle/mod/scorm/db/mysql.sql,v
 
RCS file: /cvsroot/moodle/moodle/mod/scorm/db/postgres7.php,v
< <?php // $Id: postgres7.php,v 1.28.2.1 2005/08/15 22:30:46 patrickslee Exp $
> <?php // $Id: postgres7.php,v 1.28.2.2 2006/06/05 08:11:29 bobopinna Exp $
 
RCS file: /cvsroot/moodle/moodle/mod/scorm/db/postgres7.sql,v


==Files with MOODLE_16_MERGED tag not updated - Tue Jul 18 18:40:40 CEST 2006 ==
__UNMERGED_FILES_REPORT__
 
 
RCS file: /cvsroot/moodle/moodle/auth/README,v
==To generate this information yourself==
 
 
  RCS file: /cvsroot/moodle/moodle/lang/en_utf8/enrol_authorize.php,v
Run the following commandline at the top level of your CVS sandbox:
< <?PHP // $Id: enrol_authorize.php,v 1.9.2.16 2006/06/29 19:15:26 ethem Exp $
 
> <?PHP // $Id: enrol_authorize.php,v 1.9.2.17 2006/07/06 11:53:02 ethem Exp $
  cvs diff -kkv -r MOODLE_19_MERGED -r MOODLE_19_STABLE | egrep '^(RCS|[<>] <\?[Pp][Hh][Pp] *\/\/ *\$Id)' > unmergedfiles.txt; cat unmergedfiles.txt
 
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/scorm.php,v
< <?php // $Id: scorm.php,v 1.3 2006/03/07 10:51:21 bobopinna Exp $
> <?php // $Id: scorm.php,v 1.3.2.1 2006/06/08 15:24:23 bobopinna Exp $
 
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/help/scorm/advanced.html,v
 
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/help/scorm/autocontinue.html,v
 
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/help/scorm/browsemode.html,v
 
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/help/scorm/size.html,v
 
RCS file: /cvsroot/moodle/moodle/mod/hotpot/restorelib.php,v
< <?PHP //$Id: restorelib.php,v 1.11 2006/01/25 07:20:13 gbateson Exp $
> <?PHP //$Id: restorelib.php,v 1.11.2.2 2006/07/15 14:28:22 gbateson Exp $
 
RCS file: /cvsroot/moodle/moodle/mod/hotpot/version.php,v
< <?PHP // $Id: version.php,v 1.34.2.2 2006/05/22 00:07:33 gbateson Exp $
> <?PHP // $Id: version.php,v 1.34.2.3 2006/07/16 06:54:53 gbateson Exp $
 
RCS file: /cvsroot/moodle/moodle/mod/hotpot/db/postgres7.php,v
 
RCS file: /cvsroot/moodle/moodle/mod/hotpot/db/postgres7.sql,v
 
RCS file: /cvsroot/moodle/moodle/mod/hotpot/db/update_to_v2.php,v
 
RCS file: /cvsroot/moodle/moodle/mod/lesson/view.php,v
< <?PHP  // $Id: view.php,v 1.91.2.3 2006/07/10 22:38:45 skodak Exp $
> <?PHP  // $Id: view.php,v 1.91.2.4 2006/07/13 00:34:20 mark-nielsen Exp $
 
RCS file: /cvsroot/moodle/moodle/question/export.php,v
< <?php // $Id: export.php,v 1.17.2.2 2006/05/22 13:04:17 tjhunt Exp $
> <?php // $Id: export.php,v 1.17.2.3 2006/07/18 13:32:54 tjhunt Exp $
< * @version $Id: export.php,v 1.17.2.2 2006/05/22 13:04:17 tjhunt Exp $
> * @version $Id: export.php,v 1.17.2.3 2006/07/18 13:32:54 tjhunt Exp $
 
RCS file: /cvsroot/moodle/moodle/question/format.php,v
< <?php  // $Id: format.php,v 1.9.2.2 2006/05/22 11:19:32 tjhunt Exp $ 
> <?php  // $Id: format.php,v 1.9.2.3 2006/07/18 13:32:54 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/moodle/question/format/qti2/format.php,v
< <?php  // $Id: format.php,v 1.7 2006/03/28 18:53:16 stronk7 Exp $
> <?php  // $Id: format.php,v 1.7.2.1 2006/07/18 13:32:54 tjhunt Exp $


==Some useful links==
==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.
* [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.