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

Development:Unmerged files: Difference between revisions

From MoodleDocs
No edit summary
 
(510 intermediate revisions by 7 users not shown)
Line 1: Line 1:
==Files with MOODLE_15_MERGED tag not updated - Mon May 29 21:16:53 CEST 2006 ==
__NOEDITSECTION__
 
==Unmerged Files Report==
RCS file: /cvsroot/moodle/moodle/version.php,v
 
RCS file: /cvsroot/moodle/moodle/grade/lib.php,v
< <?php // $Id: lib.php,v 1.16.2.13 2006/02/13 01:36:26 toyomoyo Exp $
> <?php // $Id: lib.php,v 1.16.2.14 2006/05/16 04:07:47 vyshane 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/quiz/lib.php,v
< <?php  // $Id: lib.php,v 1.217.2.6 2006/03/07 23:44:01 skodak Exp $
> <?php  // $Id: lib.php,v 1.217.2.7 2006/05/13 17:28:28 gustav_delius Exp $
< * @version $Id: lib.php,v 1.217.2.6 2006/03/07 23:44:01 skodak Exp $
> * @version $Id: lib.php,v 1.217.2.7 2006/05/13 17:28:28 gustav_delius Exp $


==Files with MOODLE_16_MERGED tag not updated - Mon May 29 21:27:47 CEST 2006 ==
__UNMERGED_FILES_REPORT__
 
 
RCS file: /cvsroot/moodle/moodle/auth/shibboleth/README.txt,v
==To generate this information yourself==
 
 
RCS file: /cvsroot/moodle/moodle/auth/shibboleth/config.html,v
Run the following commandline at the top level of your CVS sandbox:
 
 
RCS file: /cvsroot/moodle/moodle/auth/shibboleth/index.php,v
  cvs diff -kkv -r MOODLE_19_MERGED -r MOODLE_19_STABLE | egrep '^(RCS|[<>] <\?[Pp][Hh][Pp] *\/\/ *\$Id)' > unmergedfiles.txt; cat unmergedfiles.txt
  < <?php // $Id: index.php,v 1.7 2006/02/16 08:59:59 exe-cutor Exp $
> <?php // $Id: index.php,v 1.7.2.1 2006/05/17 12:37:13 exe-cutor Exp $
 
RCS file: /cvsroot/moodle/moodle/auth/shibboleth/lib.php,v
< <?PHP  // $Id: lib.php,v 1.16 2006/04/12 14:54:01 exe-cutor Exp $
> <?PHP  // $Id: lib.php,v 1.16.2.1 2006/05/17 12:37:13 exe-cutor Exp $
 
RCS file: /cvsroot/moodle/moodle/backup/db/postgres7.php,v
< <?php  //$Id: postgres7.php,v 1.3 2006/03/29 11:33:59 nfreear Exp $
> <?php  //$Id: postgres7.php,v 1.3.2.1 2006/05/17 06:20:37 martinlanghoff Exp $
 
RCS file: /cvsroot/moodle/moodle/filter/mediaplugin/mp3player.fla.zip,v
 
RCS file: /cvsroot/moodle/moodle/filter/mediaplugin/mp3player.swf,v
 
RCS file: /cvsroot/moodle/moodle/grade/lib.php,v
< <?php // $Id: lib.php,v 1.31.2.1 2006/05/15 02:25:42 toyomoyo Exp $
> <?php // $Id: lib.php,v 1.31.2.3 2006/05/16 06:57:08 vyshane 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.47 2006/05/02 05:18:01 gbateson Exp $
> <?PHP  // $Id: lib.php,v 1.47.2.1 2006/05/22 00:07:33 gbateson Exp $
 
RCS file: /cvsroot/moodle/moodle/mod/hotpot/version.php,v
< <?PHP // $Id: version.php,v 1.34 2006/05/02 05:18:01 gbateson Exp $
> <?PHP // $Id: version.php,v 1.34.2.2 2006/05/22 00:07:33 gbateson Exp $
 
RCS file: /cvsroot/moodle/moodle/mod/hotpot/db/postgres7.php,v
 
RCS file: /cvsroot/moodle/moodle/mod/lesson/lesson.php,v
 
RCS file: /cvsroot/moodle/moodle/mod/lesson/locallib.php,v
 
RCS file: /cvsroot/moodle/moodle/mod/lesson/version.php,v
< <?PHP // $Id: version.php,v 1.23 2006/05/01 19:02:38 michaelpenne Exp $
> <?PHP // $Id: version.php,v 1.23.2.1 2006/05/17 06:19:17 martinlanghoff Exp $
 
RCS file: /cvsroot/moodle/moodle/mod/lesson/view.php,v
< <?PHP  // $Id: view.php,v 1.91 2006/05/02 17:05:29 mark-nielsen Exp $
> <?PHP  // $Id: view.php,v 1.91.2.2 2006/05/19 00:59:22 mark-nielsen Exp $
 
RCS file: /cvsroot/moodle/moodle/mod/lesson/db/postgres7.sql,v
 
RCS file: /cvsroot/moodle/moodle/mod/quiz/version.php,v
< <?php // $Id: version.php,v 1.104.2.1 2006/05/13 16:41:22 gustav_delius Exp $
> <?php // $Id: version.php,v 1.104.2.2 2006/05/17 06:24:28 martinlanghoff Exp $
 
RCS file: /cvsroot/moodle/moodle/mod/quiz/db/postgres7.php,v
< <?php // $Id: postgres7.php,v 1.93.2.1 2006/05/13 16:41:23 gustav_delius Exp $
> <?php // $Id: postgres7.php,v 1.93.2.3 2006/05/17 06:24:59 martinlanghoff Exp $
 
RCS file: /cvsroot/moodle/moodle/mod/scorm/version.php,v
< <?php // $Id: version.php,v 1.34 2006/02/14 02:44:03 toyomoyo Exp $
> <?php // $Id: version.php,v 1.34.2.1 2006/05/17 06:17:32 martinlanghoff Exp $
 
RCS file: /cvsroot/moodle/moodle/user/tabs.php,v
< <?php  // $Id: tabs.php,v 1.7.2.1 2006/05/15 21:32:22 skodak Exp $
> <?php  // $Id: tabs.php,v 1.7.2.2 2006/05/23 09:00:58 skodak 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.