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
 
(485 intermediate revisions by 7 users not shown)
Line 1: Line 1:
==Files with MOODLE_15_MERGED tag not updated - Sun Aug 20 20:29:05 CEST 2006 ==
__NOEDITSECTION__
 
==Unmerged Files Report==
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/mod.html,v
 
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 - Sun Aug 20 20:30:51 CEST 2006 ==
__UNMERGED_FILES_REPORT__
 
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/forum.php,v
< <?PHP // $Id: forum.php,v 1.2.2.2 2006/07/31 04:54:06 martinlanghoff Exp $ 
> <?PHP // $Id: forum.php,v 1.2.2.3 2006/07/31 05:56:48 martinlanghoff Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/forum/discuss.php,v
< <?php // $Id: discuss.php,v 1.65.2.5 2006/07/31 04:54:07 martinlanghoff Exp $
> <?php // $Id: discuss.php,v 1.65.2.6 2006/07/31 05:56:48 martinlanghoff Exp $
 
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 $


==To generate this information yourself==
==To generate this information yourself==
Line 43: 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_16_MERGED -r MOODLE_16_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==


* [[: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.